summaryrefslogtreecommitdiffstats
path: root/prototypes/puppet-infracloud/modules
diff options
context:
space:
mode:
authorYolanda Robla Mota <yroblamo@redhat.com>2016-08-25 15:52:32 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-09-01 07:27:11 +0000
commitfad004c161b166ccca4b8230d40d447c63ba8af4 (patch)
tree0247a48174fabe2768a35857a1b6bfaa93223db2 /prototypes/puppet-infracloud/modules
parentd3421e222d0b504f58c14d28cbe8aea65bd51a47 (diff)
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
Diffstat (limited to 'prototypes/puppet-infracloud/modules')
-rw-r--r--prototypes/puppet-infracloud/modules/opnfv/manifests/compute.pp8
-rw-r--r--prototypes/puppet-infracloud/modules/opnfv/manifests/controller.pp8
2 files changed, 16 insertions, 0 deletions
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,