summaryrefslogtreecommitdiffstats
path: root/prototypes/puppet-infracloud
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-09-01 08:37:29 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-01 08:37:29 +0000
commitfcca04ef6b382db87e76540052bc57e8df593692 (patch)
tree34a1b817e37918b996df23fbe61b0206cedd992f /prototypes/puppet-infracloud
parent58fe337566ad5ecead81623ec9f5c575e79654cb (diff)
parentfad004c161b166ccca4b8230d40d447c63ba8af4 (diff)
Merge "Disable selinux on RHEL case"
Diffstat (limited to 'prototypes/puppet-infracloud')
-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,