diff options
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 13 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/storage_plugins/ceph.yml | 7 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/storage_plugins/glusterfs.yml | 7 | 
3 files changed, 26 insertions, 1 deletions
| diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 42d984a09..36bcc1a90 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -40,12 +40,23 @@  # problems because the rpms don't pin the version properly.  - name: Install Node package    yum: pkg={{ openshift.common.service_type }}-node{{ openshift_version  }},tuned-profiles-{{ openshift.common.service_type }}-node{{ openshift_version  }} state=present +  when: ansible_pkg_mgr == "yum" +  register: node_install_result + +- name: Install Node package +  dnf: pkg={{ openshift.common.service_type }}-node{{ openshift_version  }},tuned-profiles-{{ openshift.common.service_type }}-node{{ openshift_version  }} state=present +  when: ansible_pkg_mgr == "dnf"    register: node_install_result  - name: Install sdn-ovs package    yum: pkg={{ openshift.common.service_type }}-sdn-ovs{{ openshift_version }} state=present    register: sdn_install_result -  when: openshift.common.use_openshift_sdn +  when: ansible_pkg_mgr == "yum" and openshift.common.use_openshift_sdn + +- name: Install sdn-ovs package +  dnf: pkg={{ openshift.common.service_type }}-sdn-ovs{{ openshift_version }} state=present +  register: sdn_install_result +  when: ansible_pkg_mgr == "dnf" and openshift.common.use_openshift_sdn  # TODO: add the validate parameter when there is a validation command to run  - name: Create the Node config diff --git a/roles/openshift_node/tasks/storage_plugins/ceph.yml b/roles/openshift_node/tasks/storage_plugins/ceph.yml index b6936618a..b5146dcac 100644 --- a/roles/openshift_node/tasks/storage_plugins/ceph.yml +++ b/roles/openshift_node/tasks/storage_plugins/ceph.yml @@ -3,3 +3,10 @@    yum:      pkg: ceph-common      state: installed +  when: ansible_pkg_mgr == "yum" + +- name: Install Ceph storage plugin dependencies +  dnf: +    pkg: ceph-common +    state: installed +  when: ansible_pkg_mgr == "dnf" diff --git a/roles/openshift_node/tasks/storage_plugins/glusterfs.yml b/roles/openshift_node/tasks/storage_plugins/glusterfs.yml index decf4f49d..a357023e1 100644 --- a/roles/openshift_node/tasks/storage_plugins/glusterfs.yml +++ b/roles/openshift_node/tasks/storage_plugins/glusterfs.yml @@ -3,6 +3,13 @@    yum:      pkg: glusterfs-fuse      state: installed +  when: ansible_pkg_mgr == "yum" + +- name: Install GlusterFS storage plugin dependencies +  dnf: +    pkg: glusterfs-fuse +    state: installed +  when: ansible_pkg_mgr == "dnf"  - name: Set sebooleans to allow gluster storage plugin access from containers    seboolean: | 
