Merge "Revert "Turn selinux back on after cloud-init""

This commit is contained in:
Jenkins 2016-03-08 07:33:05 +00:00 committed by Gerrit Code Review
commit 3955cfff96
5 changed files with 8 additions and 6 deletions

View File

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

View File

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

View File

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

View File

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

View File

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