summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/tasks/main.yml
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2016-11-16 16:30:28 -0500
committerRussell Teague <rteague@redhat.com>2016-11-17 15:10:37 -0500
commit7e0c346c8406eb6142e8d38fdec4e13236f3cdc6 (patch)
tree2bc96a95a6b60cdcc7278966886b14079c71f7eb /roles/openshift_node/tasks/main.yml
parentac1b73841a109f6e9f6947434a9e1aca382e61c6 (diff)
downloadopenshift-7e0c346c8406eb6142e8d38fdec4e13236f3cdc6.tar.gz
openshift-7e0c346c8406eb6142e8d38fdec4e13236f3cdc6.tar.bz2
openshift-7e0c346c8406eb6142e8d38fdec4e13236f3cdc6.tar.xz
openshift-7e0c346c8406eb6142e8d38fdec4e13236f3cdc6.zip
Refactor to use Ansible package module
The Ansible package module will call the correct package manager for the underlying OS.
Diffstat (limited to 'roles/openshift_node/tasks/main.yml')
-rw-r--r--roles/openshift_node/tasks/main.yml8
1 files changed, 6 insertions, 2 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 6022694bc..3364fe1b3 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: Set atomic-guest tuned profile
@@ -43,7 +45,9 @@
when: 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