Merge "Turn selinux back on after cloud-init"

magnum/templates/kubernetes/fragments/disable-selinux.sh

@@ -2,7 +2,3 @@
 #!/bin/sh
 
 setenforce 0
-
-sed -i '
-  /^SELINUX=/ s/=.*/=permissive/
-' /etc/selinux/config

magnum/templates/kubernetes/fragments/enable-services-master.sh

@@ -9,3 +9,5 @@ for service in etcd docker kube-apiserver kubelet; do
     systemctl enable $service
     systemctl --no-block start $service
 done
+
+setenforce 1

magnum/templates/kubernetes/fragments/enable-services-minion.sh

@@ -15,3 +15,5 @@ for service in docker kubelet; do
     systemctl enable $service
     systemctl --no-block start $service
 done
+
+setenforce 1

magnum/templates/swarm/fragments/disable-selinux.sh

@@ -2,7 +2,3 @@
 #!/bin/sh
 
 setenforce 0
-
-sed -i '
-  /^SELINUX=/ s/=.*/=permissive/
-' /etc/selinux/config

magnum/templates/swarm/fragments/enable-services.sh

@@ -7,3 +7,5 @@ for service in $NODE_SERVICES; do
     systemctl enable $service
     systemctl --no-block start $service
 done
+
+setenforce 1