Jelajahi Sumber

Merge pull request #2356 from maxamillion/fedora

don't set virt_sandbox_use_nfs on Fedora, it was replaced by virt_use_nfs
Jason DeTiberus 8 tahun lalu
induk
melakukan
6672dc48ce
1 mengubah file dengan 4 tambahan dan 4 penghapusan
  1. 4 4
      roles/openshift_node/tasks/storage_plugins/nfs.yml

+ 4 - 4
roles/openshift_node/tasks/storage_plugins/nfs.yml

@@ -17,16 +17,16 @@
     persistent: yes
   when: ansible_selinux and ansible_selinux.status == "enabled" and virt_use_nfs_output.rc == 0
 
-- name: Check for existence of virt_sandbox_use_nfs seboolean
+- name: Check for existence of virt_sandbox_use_nfs seboolean (RHEL)
   command: getsebool virt_sandbox_use_nfs
   register: virt_sandbox_use_nfs_output
-  when: ansible_selinux and ansible_selinux.status == "enabled"
+  when: ansible_distribution != "Fedora" and ansible_selinux and ansible_selinux.status == "enabled"
   failed_when: false
   changed_when: false
 
-- name: Set seboolean to allow nfs storage plugin access from containers(sandbox)
+- name: Set seboolean to allow nfs storage plugin access from containers(sandbox) (RHEL)
   seboolean:
     name: virt_sandbox_use_nfs
     state: yes
     persistent: yes
-  when: ansible_selinux and ansible_selinux.status == "enabled" and virt_sandbox_use_nfs_output.rc == 0
+  when: ansible_distribution != "Fedora" and ansible_selinux and ansible_selinux.status == "enabled" and virt_sandbox_use_nfs_output.rc == 0