From: Yolanda Robla Mota <yroblamo@redhat.com>
Date: Thu, 25 Aug 2016 13:52:32 +0000 (+0200)
Subject: Disable selinux on RHEL case
X-Git-Tag: colorado.1.0~91^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=fad004c161b166ccca4b8230d40d447c63ba8af4;p=releng.git

Disable selinux on RHEL case

This is causing several puppet moduels to fail (for example
rabbit not starting). Set that to permissive as a workaround,
but with the intention of fixing the configuration and enabling
selinux on next steps.

Signed-Off-By: Yolanda Robla <yroblamo@redhat.com>
Change-Id: I34b388792699a9563dacedf87dd6ff85e482e431
---

diff --git a/prototypes/puppet-infracloud/modules/opnfv/manifests/compute.pp b/prototypes/puppet-infracloud/modules/opnfv/manifests/compute.pp
index ca548a5d5..77908c0b8 100644
--- a/prototypes/puppet-infracloud/modules/opnfv/manifests/compute.pp
+++ b/prototypes/puppet-infracloud/modules/opnfv/manifests/compute.pp
@@ -8,6 +8,14 @@ class opnfv::compute (
   $controller_public_address,
   $virt_type = 'kvm',
 ) {
+  # disable selinux if needed
+  if $::osfamily == 'RedHat' {
+    class { 'selinux':
+      mode   => 'permissive',
+      before => Class['::infracloud::compute'],
+    }
+  }
+
   class { '::infracloud::compute':
     nova_rabbit_password          => $nova_rabbit_password,
     neutron_rabbit_password       => $neutron_rabbit_password,
diff --git a/prototypes/puppet-infracloud/modules/opnfv/manifests/controller.pp b/prototypes/puppet-infracloud/modules/opnfv/manifests/controller.pp
index 7522692c1..4bae42cf7 100644
--- a/prototypes/puppet-infracloud/modules/opnfv/manifests/controller.pp
+++ b/prototypes/puppet-infracloud/modules/opnfv/manifests/controller.pp
@@ -30,6 +30,14 @@ class opnfv::controller (
   $opnfv_password,
   $opnfv_email = 'opnfvuser@gmail.com',
 ) {
+  # disable selinux if needed
+  if $::osfamily == 'RedHat' {
+    class { 'selinux':
+      mode   => 'permissive',
+      before => Class['::infracloud::controller'],
+    }
+  }
+
   class { '::infracloud::controller':
     keystone_rabbit_password         => $keystone_rabbit_password,
     neutron_rabbit_password          => $neutron_rabbit_password,