summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-08-24 15:21:45 -0400
committerGitHub <noreply@github.com>2016-08-24 15:21:45 -0400
commit6672dc48ceec8a3f918859a539402b57df43f2c2 (patch)
treeb910885cf3d5a211f0f796f6891c377f07512f16 /roles
parent9d9981755bdf393e36d2a5d04eba01ded20c9245 (diff)
parent7c74fb1a0928b6a32b58234f71cb89af1ae5a15c (diff)
downloadopenshift-6672dc48ceec8a3f918859a539402b57df43f2c2.tar.gz
openshift-6672dc48ceec8a3f918859a539402b57df43f2c2.tar.bz2
openshift-6672dc48ceec8a3f918859a539402b57df43f2c2.tar.xz
openshift-6672dc48ceec8a3f918859a539402b57df43f2c2.zip
Merge pull request #2356 from maxamillion/fedora
don't set virt_sandbox_use_nfs on Fedora, it was replaced by virt_use_nfs
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node/tasks/storage_plugins/nfs.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_node/tasks/storage_plugins/nfs.yml b/roles/openshift_node/tasks/storage_plugins/nfs.yml
index e384c1bd7..22b539d16 100644
--- a/roles/openshift_node/tasks/storage_plugins/nfs.yml
+++ b/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