Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315882

Change subject: installserver: move standard include to role
......................................................................

installserver: move standard include to role

Move the "include standard" into the role and remove
it from node level. Simplify site.pp.

Change-Id: I9291b3af15c054dfa7a112c635c4d10c87011dbd
---
M manifests/role/installserver.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/315882/1

diff --git a/manifests/role/installserver.pp b/manifests/role/installserver.pp
index ca5e2b0..db7b75a 100644
--- a/manifests/role/installserver.pp
+++ b/manifests/role/installserver.pp
@@ -25,6 +25,7 @@
                         DHCP and Web server',
     }
 
+    include standard
     include base::firewall
     include role::backup::host
     include install_server::preseed_server
diff --git a/manifests/site.pp b/manifests/site.pp
index 6b7f891..eea7bca 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -228,8 +228,6 @@
         interface => 'eth0',
     }
 
-    include standard
-
     class { 'ganglia::monitor::aggregator':
         sites =>  'eqiad',
     }
@@ -1312,8 +1310,6 @@
     interface::add_ip6_mapped { 'main':
         interface => 'eth0',
     }
-
-    include standard
 }
 
 node 'install2001.wikimedia.org' {
@@ -1323,8 +1319,6 @@
     interface::add_ip6_mapped { 'main':
         interface => 'eth0',
     }
-
-    include standard
 
     class { 'ganglia::monitor::aggregator':
         sites =>  'codfw',

-- 
To view, visit https://gerrit.wikimedia.org/r/315882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9291b3af15c054dfa7a112c635c4d10c87011dbd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to