From 2bfe76df0d6c209167af087fbdea2abd1873f92c Mon Sep 17 00:00:00 2001
From: Yolanda Robla Mota <yroblamo@redhat.com>
Date: Fri, 9 Sep 2016 17:26:33 +0200
Subject: 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>
---
prototypes/puppet-infracloud/modules/opnfv/manifests/compute.pp | 8 --------
.../puppet-infracloud/modules/opnfv/manifests/controller.pp | 8 --------
2 files changed, 16 deletions(-)
(limited to 'prototypes')
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,
--
cgit