summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/tasks
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_master/tasks
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_master/tasks')
-rw-r--r--roles/openshift_master/tasks/main.yml8
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