summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYolanda Robla Mota <yroblamo@redhat.com>2016-09-09 17:26:33 +0200
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2017-08-11 12:56:12 -0700
commit48342d7c9c8c2d20739e7e4c2b1fa6f8aee3cc04 (patch)
tree8b4b0c6486b6b120228c2386d8d7e6f1cc8b98b3
parent91c16965d498c5c894e7a4c43248e438567fa572 (diff)
Stop disabling selinux
It is already disabled in origin in puppet-infracloud, and it is causing an error with duplicates now. Change-Id: Ie40232c03138f1c8a1516895828c6cfd5730f9f7 Signed-Off-By: Yolanda Robla <yroblamo@redhat.com>
-rw-r--r--puppet-infracloud/modules/opnfv/manifests/compute.pp8
-rw-r--r--puppet-infracloud/modules/opnfv/manifests/controller.pp8
2 files changed, 0 insertions, 16 deletions
diff --git a/puppet-infracloud/modules/opnfv/manifests/compute.pp b/puppet-infracloud/modules/opnfv/manifests/compute.pp
index 77908c0b..ca548a5d 100644
--- a/puppet-infracloud/modules/opnfv/manifests/compute.pp
+++ b/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/puppet-infracloud/modules/opnfv/manifests/controller.pp b/puppet-infracloud/modules/opnfv/manifests/controller.pp
index 4bae42cf..7522692c 100644
--- a/puppet-infracloud/modules/opnfv/manifests/controller.pp
+++ b/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,