From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Mon, 12 Sep 2016 09:43:10 +0000 (+0000)
Subject: Merge "Stop disabling selinux"
X-Git-Tag: colorado.1.0~46
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9c2378d22524f96cd63454fa17ad8fc93ddf8bd9;hp=03388550bea11566ed3ae90129bab2e3b01eef1a;p=releng.git

Merge "Stop disabling selinux"
---

diff --git a/prototypes/puppet-infracloud/modules/opnfv/manifests/compute.pp b/prototypes/puppet-infracloud/modules/opnfv/manifests/compute.pp
index 77908c0b8..ca548a5d5 100644
--- a/prototypes/puppet-infracloud/modules/opnfv/manifests/compute.pp
+++ b/prototypes/puppet-infracloud/modules/opnfv/manifests/compute.pp
@@ -8,14 +8,6 @@ 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 4bae42cf7..7522692c1 100644
--- a/prototypes/puppet-infracloud/modules/opnfv/manifests/controller.pp
+++ b/prototypes/puppet-infracloud/modules/opnfv/manifests/controller.pp
@@ -30,14 +30,6 @@ 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,