diff options
| author | Scott Dodson <sdodson@redhat.com> | 2015-12-09 15:06:48 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2015-12-09 16:43:27 -0500 |
| commit | b1d30491f1581503003646684137bf2c218660ba (patch) | |
| tree | cba54e9138630742d0788a5cff9f70ec75b93032 /roles/openshift_master | |
| parent | ecae1fcaaf6d83f2fb6dce0624990b2d13c25db9 (diff) | |
| download | openshift-b1d30491f1581503003646684137bf2c218660ba.tar.gz openshift-b1d30491f1581503003646684137bf2c218660ba.tar.bz2 openshift-b1d30491f1581503003646684137bf2c218660ba.tar.xz openshift-b1d30491f1581503003646684137bf2c218660ba.zip | |
Remove yum / dnf duplication
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 011b5dedd..bd3d8f90c 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -78,14 +78,7 @@ controller_lease_ttl: "{{ osm_controller_lease_ttl | default(None) }}" - name: Install Master package - yum: pkg={{ openshift.common.service_type }}-master{{ openshift_version }} state=present - when: ansible_pkg_mgr == "yum" - register: install_result - -- name: Install Master package - dnf: pkg={{ openshift.common.service_type }}-master{{ openshift_version }} state=present - when: ansible_pkg_mgr == "dnf" - register: install_result + action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-master{{ openshift_version }} state=present" - name: Re-gather package dependent master facts openshift_facts: @@ -117,13 +110,8 @@ - restart master controllers - name: Install httpd-tools if needed - yum: pkg=httpd-tools state=present - when: (ansible_pkg_mgr == "yum") and (item.kind == 'HTPasswdPasswordIdentityProvider') - with_items: openshift.master.identity_providers - -- name: Install httpd-tools if needed - dnf: pkg=httpd-tools state=present - when: (ansible_pkg_mgr == "dnf") and (item.kind == 'HTPasswdPasswordIdentityProvider') + action: "{{ ansible_pkg_mgr }} name=httpd-tools state=present" + when: (item.kind == 'HTPasswdPasswordIdentityProvider') with_items: openshift.master.identity_providers - name: Ensure htpasswd directory exists @@ -267,7 +255,7 @@ when: openshift_master_ha | bool and openshift.master.cluster_method == 'native' - name: Install cluster packages - action: "{{ansible_pkg_mgr}} pkg=pcs state=present" + action: "{{ ansible_pkg_mgr }} name=pcs state=present" when: openshift_master_ha | bool and openshift.master.cluster_method == 'pacemaker' register: install_result |