summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-08-01 12:15:04 -0400
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-08-03 17:20:52 +0200
commit302171a630655f943f581634a7b8283160feb564 (patch)
treea1567408dd25203fe53d566034982f47f3adf22d
parent6245045546024ea1dbd4635ab4d1d58783c3aa34 (diff)
downloadopenshift-302171a630655f943f581634a7b8283160feb564.tar.gz
openshift-302171a630655f943f581634a7b8283160feb564.tar.bz2
openshift-302171a630655f943f581634a7b8283160feb564.tar.xz
openshift-302171a630655f943f581634a7b8283160feb564.zip
cri-o: Continue node without SELinux check
cri-o currently requires SELinux to be off. This change disables the SELinux check in the openshift_node role when cri-o is in use.
-rw-r--r--roles/openshift_node/tasks/main.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 87b1f6537..6c3d10134 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -2,9 +2,9 @@
# TODO: allow for overriding default ports where possible
- fail:
msg: "SELinux is disabled, This deployment type requires that SELinux is enabled."
- when: >
- (not ansible_selinux or ansible_selinux.status != 'enabled') and
- deployment_type in ['enterprise', 'online', 'atomic-enterprise', 'openshift-enterprise']
+ when:
+ - (not ansible_selinux or ansible_selinux.status != 'enabled') and deployment_type in ['enterprise', 'online', 'atomic-enterprise', 'openshift-enterprise']
+ - not openshift_docker_use_crio | default(false)
# https://docs.openshift.com/container-platform/3.4/admin_guide/overcommit.html#disabling-swap-memory
- name: Check for swap usage