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 77908c0..ca548a5 100644 (file)
--- 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 4bae42c..7522692 100644 (file)
--- 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,