summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2015-12-09 10:13:29 -0500
committerAndrew Butcher <abutcher@redhat.com>2015-12-09 10:13:29 -0500
commit6082cce51dc17472dd5a567399783574742ca7a6 (patch)
treea2a43ff608bc8773e4a18b5c78570eea9125c2eb
parentbc10731cb98eb4169c430de24044783c7c5183cd (diff)
downloadopenshift-6082cce51dc17472dd5a567399783574742ca7a6.tar.gz
openshift-6082cce51dc17472dd5a567399783574742ca7a6.tar.bz2
openshift-6082cce51dc17472dd5a567399783574742ca7a6.tar.xz
openshift-6082cce51dc17472dd5a567399783574742ca7a6.zip
Squash pcs install into one task.
-rw-r--r--roles/openshift_master/tasks/main.yml9
1 files changed, 2 insertions, 7 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 8a78f8f2a..011b5dedd 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -267,13 +267,8 @@
when: openshift_master_ha | bool and openshift.master.cluster_method == 'native'
- name: Install cluster packages
- yum: pkg=pcs state=present
- when: (ansible_pkg_mgr == "yum") and openshift_master_ha | bool and openshift.master.cluster_method == 'pacemaker'
- register: install_result
-
-- name: Install cluster packages
- dnf: pkg=pcs state=present
- when: (ansible_pkg_mgr == "dnf") and openshift_master_ha | bool and openshift.master.cluster_method == 'pacemaker'
+ action: "{{ansible_pkg_mgr}} pkg=pcs state=present"
+ when: openshift_master_ha | bool and openshift.master.cluster_method == 'pacemaker'
register: install_result
- name: Start and enable cluster service