diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-09 10:40:26 -0500 | 
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-09 10:40:26 -0500 | 
| commit | 530aaf841d38c036a2d08df075f85d63b8a52840 (patch) | |
| tree | 0012b3198067d1443099cea8e597fd1666179d44 /roles/openshift_master/tasks | |
| parent | 7a5270f2d88148394d60ba5e6ad79540df517688 (diff) | |
| parent | 6082cce51dc17472dd5a567399783574742ca7a6 (diff) | |
Merge pull request #1040 from abutcher/pacemaker-pass
Squash pcs install into one task.
Diffstat (limited to 'roles/openshift_master/tasks')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 9 | 
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  | 
