瀏覽代碼

Make the playbooks friendlier with SELinux disabled hosts

Lénaïc Huard 9 年之前
父節點
當前提交
8d80cf21e7
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      roles/openshift_node/tasks/main.yml

+ 3 - 1
roles/openshift_node/tasks/main.yml

@@ -63,11 +63,13 @@
   lineinfile:
     dest: /etc/sysconfig/docker
     regexp: '^OPTIONS=.*'
-    line: "OPTIONS='--insecure-registry={{ openshift.node.portal_net }} --selinux-enabled'"
+    line: "OPTIONS='--insecure-registry={{ openshift.node.portal_net }} \
+{% if ansible_selinux and ansible_selinux.status == '''enabled''' %}--selinux-enabled{% endif %}'"
   when: docker_check.stat.isreg
 
 - name: Allow NFS access for VMs
   seboolean: name=virt_use_nfs state=yes persistent=yes
+  when: ansible_selinux and ansible_selinux.status == "enabled"
 
 - name: Start and enable openshift-node
   service: name=openshift-node enabled=yes state=started