diff options
author | Yolanda Robla Mota <yroblamo@redhat.com> | 2016-08-25 15:52:32 +0200 |
---|---|---|
committer | Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-08-11 12:56:12 -0700 |
commit | b2e18e76e5c47b6e099d471fe05624f0b64d226a (patch) | |
tree | d8cff82956a68fbd711864985d10c4241f009421 /puppet-infracloud/modules/opnfv/manifests | |
parent | da7ad8ea7b6bce15caee80ae3e3b8d353e857aef (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 'puppet-infracloud/modules/opnfv/manifests')
-rw-r--r-- | puppet-infracloud/modules/opnfv/manifests/compute.pp | 8 | ||||
-rw-r--r-- | puppet-infracloud/modules/opnfv/manifests/controller.pp | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/puppet-infracloud/modules/opnfv/manifests/compute.pp b/puppet-infracloud/modules/opnfv/manifests/compute.pp index ca548a5d..77908c0b 100644 --- a/puppet-infracloud/modules/opnfv/manifests/compute.pp +++ b/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/puppet-infracloud/modules/opnfv/manifests/controller.pp b/puppet-infracloud/modules/opnfv/manifests/controller.pp index 7522692c..4bae42cf 100644 --- a/puppet-infracloud/modules/opnfv/manifests/controller.pp +++ b/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, |