diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-09-21 13:22:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-21 13:22:08 +0000 |
| commit | 9f7616b1e09a5d1aa2828f91c2b6f0e534e7a85f (patch) | |
| tree | 3e850f24de974775694ce30376b779e9ef6e25cf /prototypes | |
| parent | 82959decbf3fefcf87fde20a95da26d96e1ea418 (diff) | |
| parent | e6f876639ccd52473914919123540668bbe9708a (diff) | |
Merge "Stop using sudoers on all servers defined"
Diffstat (limited to 'prototypes')
| -rw-r--r-- | prototypes/puppet-infracloud/manifests/site.pp | 4 | ||||
| -rw-r--r-- | prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/prototypes/puppet-infracloud/manifests/site.pp b/prototypes/puppet-infracloud/manifests/site.pp index 2cb12a3cd..31c45767f 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 5bbcd7506..4113c50e6 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, |