Let openshift-ansible manage selinux and insecure_registry

openshift-ansible now manages selinux and insecure_registry parameters so it's conflicting with our own management of it. It defaults to selinux enabled which breaks overlay2 driver. Change-Id: Ie4f67b0e3124a299aa7cb1de6c0dd11f66a55a0e
rdo-infra · Jul 24, 2017 · c35981f · c35981f
1 parent 03ae72f
commit c35981f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/group_vars/OSEv3.yml b/group_vars/OSEv3.yml
@@ -1,4 +1,7 @@
 ---
+openshift_docker_selinux_enabled: false
+openshift_docker_insecure_registries: 172.30.0.0/16
+openshift_disable_check: memory_availability
 debug_level: 2
 
 # This is deployed on an OpenStack cloud which defaults eth0 mtu to 1450

diff --git a/roles/host-preparation/tasks/main.yml b/roles/host-preparation/tasks/main.yml
@@ -44,6 +44,14 @@
   notify:
     - Restart docker
 
+- name: Remove --selinux-enabled from /etc/sysconfig/docker for overlay2
+  lineinfile:
+    dest: "/etc/sysconfig/docker"
+    regexp: "^OPTIONS="
+    line: "OPTIONS='--log-driver=journald --signature-verification=false'"
+  notify:
+    - Restart docker
+
 - name: Configure Docker MTU
   lineinfile:
     dest: "/etc/sysconfig/docker-network"