Browse code

Merge "selinux permissive on Fedora"

Jenkins authored on 2014/06/15 03:56:29
Showing 1 changed files
... ...
@@ -87,16 +87,18 @@ if [[ ${DISTRO} =~ (precise) ]]; then
87 87
 fi
88 88
 
89 89
 
90
-# RHEL6
91
-# -----
92
-
93
-if [[ $DISTRO =~ (rhel6) ]]; then
94
-
90
+if is_fedora; then
95 91
     # Disable selinux to avoid configuring to allow Apache access
96 92
     # to Horizon files (LP#1175444)
97 93
     if selinuxenabled; then
98 94
         sudo setenforce 0
99 95
     fi
96
+fi
97
+
98
+# RHEL6
99
+# -----
100
+
101
+if [[ $DISTRO =~ (rhel6) ]]; then
100 102
 
101 103
     # If the ``dbus`` package was installed by DevStack dependencies the
102 104
     # uuid may not be generated because the service was never started (PR#598200),