diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-21 16:26:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-21 16:26:21 -0500 |
| commit | 4954982b72451f82bd40802b0bdf39379ad4bdf1 (patch) | |
| tree | b890599b1719b630e3fae8197f9d8417e9a29c20 /roles/openshift_master | |
| parent | e34870e2b1b452f9719d14911d7a2a557ca701bd (diff) | |
| parent | 7e0c346c8406eb6142e8d38fdec4e13236f3cdc6 (diff) | |
| download | openshift-4954982b72451f82bd40802b0bdf39379ad4bdf1.tar.gz openshift-4954982b72451f82bd40802b0bdf39379ad4bdf1.tar.bz2 openshift-4954982b72451f82bd40802b0bdf39379ad4bdf1.tar.xz openshift-4954982b72451f82bd40802b0bdf39379ad4bdf1.zip | |
Merge pull request #2818 from mtnbikenc/package-refactor
Refactor to use Ansible package module
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 1d6758c4a..79c62e985 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -24,7 +24,9 @@ when: openshift_master_ha | bool and openshift_master_cluster_method == "pacemaker" and openshift.common.is_containerized | bool - name: Install Master package - action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-master{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }} state=present" + package: + name: "{{ openshift.common.service_type }}-master{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }}" + state: present when: not openshift.common.is_containerized | bool - name: Pull master image @@ -77,7 +79,7 @@ - restart master controllers - name: Install httpd-tools if needed - action: "{{ ansible_pkg_mgr }} name=httpd-tools state=present" + package: name=httpd-tools state=present when: (item.kind == 'HTPasswdPasswordIdentityProvider') and not openshift.common.is_atomic | bool with_items: "{{ openshift.master.identity_providers }}" @@ -292,7 +294,7 @@ when: openshift_master_ha | bool and openshift.master.cluster_method == 'native' - name: Install cluster packages - action: "{{ ansible_pkg_mgr }} name=pcs state=present" + package: name=pcs state=present when: openshift_master_ha | bool and openshift.master.cluster_method == 'pacemaker' and not openshift.common.is_containerized | bool register: install_result |