diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-09-12 09:43:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-12 09:43:10 +0000 |
| commit | 9c2378d22524f96cd63454fa17ad8fc93ddf8bd9 (patch) | |
| tree | a97cdaa6d534127b63eed923f7514fa637ae2ba8 /prototypes/puppet-infracloud/modules | |
| parent | 03388550bea11566ed3ae90129bab2e3b01eef1a (diff) | |
| parent | 2bfe76df0d6c209167af087fbdea2abd1873f92c (diff) | |
Merge "Stop disabling selinux"
Diffstat (limited to 'prototypes/puppet-infracloud/modules')
| -rw-r--r-- | prototypes/puppet-infracloud/modules/opnfv/manifests/compute.pp | 8 | ||||
| -rw-r--r-- | prototypes/puppet-infracloud/modules/opnfv/manifests/controller.pp | 8 |
2 files changed, 0 insertions, 16 deletions
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, |