From: MatthewLi <matthew.lijun@huawei.com>
Date: Thu, 22 Sep 2016 07:36:45 +0000 (+0000)
Subject: Merge "add missed project document check/build/upload"
X-Git-Tag: colorado.1.0^0
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=279e9db83e49f7f7b1358071b3d669f4a810cbb6;hp=e48af1d680b2a443c0c681525798dd1a90bc48bb

Merge "add missed project document check/build/upload"
---

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,