diff options
| author | Lénaïc Huard <lhuard@amadeus.com> | 2015-07-17 16:46:13 +0200 |
|---|---|---|
| committer | Lénaïc Huard <lhuard@amadeus.com> | 2015-07-17 16:46:13 +0200 |
| commit | 8d80cf21e73a1015617c9ec8cd183602436e54fa (patch) | |
| tree | 7282e8b956bc82715ab89b0734fca735803cc389 | |
| parent | e0211ca67ce18fc9f74d0a9c82cf14a28f395e4d (diff) | |
| download | openshift-8d80cf21e73a1015617c9ec8cd183602436e54fa.tar.gz openshift-8d80cf21e73a1015617c9ec8cd183602436e54fa.tar.bz2 openshift-8d80cf21e73a1015617c9ec8cd183602436e54fa.tar.xz openshift-8d80cf21e73a1015617c9ec8cd183602436e54fa.zip | |
Make the playbooks friendlier with SELinux disabled hosts
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index e18846db8..5188df973 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/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 |