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_node/tasks/main.yml | |
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_node/tasks/main.yml')
-rw-r--r-- | roles/openshift_node/tasks/main.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 14d03bb44..612cc0e20 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -35,7 +35,9 @@ # We have to add tuned-profiles in the same transaction otherwise we run into depsolving # problems because the rpms don't pin the version properly. This was fixed in 3.1 packaging. - name: Install Node package - action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-node{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }},tuned-profiles-{{ openshift.common.service_type }}-node{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }} state=present" + package: + name: "{{ openshift.common.service_type }}-node{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }},tuned-profiles-{{ openshift.common.service_type }}-node{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }}" + state: present when: not openshift.common.is_containerized | bool - name: Check for tuned package @@ -49,7 +51,9 @@ when: tuned_installed.rc == 0 and openshift.common.is_atomic | bool - name: Install sdn-ovs package - action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-sdn-ovs{{ openshift_pkg_version | oo_image_tag_to_rpm_version(include_dash=True) }} state=present" + package: + name: "{{ openshift.common.service_type }}-sdn-ovs{{ openshift_pkg_version | oo_image_tag_to_rpm_version(include_dash=True) }}" + state: present when: openshift.common.use_openshift_sdn and not openshift.common.is_containerized | bool - name: Pull node image |