[MediaWiki-commits] [Gerrit] install2001: Use the role keyword - change (operations/puppet)

2015-10-20 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: install2001: Use the role keyword
..


install2001: Use the role keyword

We need this for Hiera-based assignment of Salt grains for debdeploy

Change-Id: Ic460bf010e7ab7891373aced13f9bf9607d859dc
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 328b135..53c4ce4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1129,6 +1129,7 @@
 }
 
 node 'install2001.wikimedia.org' {
+role installserver::tftp-server
 $cluster = 'misc'
 $ganglia_aggregator = true
 
@@ -1137,7 +1138,6 @@
 }
 
 include standard
-include role::installserver::tftp-server
 
 class { 'ganglia::monitor::aggregator':
 sites =>  'codfw',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic460bf010e7ab7891373aced13f9bf9607d859dc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] install2001: Use the role keyword - change (operations/puppet)

2015-10-19 Thread Muehlenhoff (Code Review) 
Muehlenhoff has uploaded a new change for review.

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

Change subject: install2001: Use the role keyword
..

install2001: Use the role keyword

We need this for Hiera-based assignment of Salt grains for debdeploy

Change-Id: Ic460bf010e7ab7891373aced13f9bf9607d859dc
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/247200/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 870d859..41370f9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1147,6 +1147,7 @@
 }
 
 node 'install2001.wikimedia.org' {
+role installserver::tftp-server
 $cluster = 'misc'
 $ganglia_aggregator = true
 
@@ -1155,7 +1156,6 @@
 }
 
 include standard
-include role::installserver::tftp-server
 
 class { 'ganglia::monitor::aggregator':
 sites =>  'codfw',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic460bf010e7ab7891373aced13f9bf9607d859dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 

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