summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-09-21 13:22:08 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-21 13:22:08 +0000
commit9f7616b1e09a5d1aa2828f91c2b6f0e534e7a85f (patch)
tree3e850f24de974775694ce30376b779e9ef6e25cf
parent82959decbf3fefcf87fde20a95da26d96e1ea418 (diff)
parente6f876639ccd52473914919123540668bbe9708a (diff)
Merge "Stop using sudoers on all servers defined"
-rw-r--r--prototypes/puppet-infracloud/manifests/site.pp4
-rw-r--r--prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp1
2 files changed, 4 insertions, 1 deletions
diff --git a/prototypes/puppet-infracloud/manifests/site.pp b/prototypes/puppet-infracloud/manifests/site.pp
index 2cb12a3..31c4576 100644
--- a/prototypes/puppet-infracloud/manifests/site.pp
+++ b/prototypes/puppet-infracloud/manifests/site.pp
@@ -8,6 +8,8 @@
##############################################################################
node 'controller00.opnfvlocal' {
$group = 'infracloud'
+ include ::sudoers
+
class { 'opnfv::server':
iptables_public_tcp_ports => [80,5000,5671,8774,9292,9696,35357], # logs,keystone,rabbit,nova,glance,neutron,keystone
sysadmins => hiera('sysadmins', []),
@@ -43,6 +45,8 @@ node 'controller00.opnfvlocal' {
node 'compute00.opnfvlocal' {
$group = 'infracloud'
+ include ::sudoers
+
class { 'opnfv::server':
sysadmins => hiera('sysadmins', []),
enable_unbound => false,
diff --git a/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp b/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp
index 5bbcd75..4113c50 100644
--- a/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp
+++ b/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp
@@ -19,7 +19,6 @@ class opnfv::server (
# Classes for all hosts
include snmpd
- include sudoers
class { 'iptables':
public_tcp_ports => $iptables_public_tcp_ports,