[MediaWiki-commits] [Gerrit] Use the role keyword for puppetmaster backends - change (operations/puppet)

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

Change subject: Use the role keyword for puppetmaster backends
..


Use the role keyword for puppetmaster backends

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

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

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 31ca0bb4..7f25114 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2319,8 +2319,8 @@
 }
 
 node /^(strontium|rhodium).eqiad.wmnet/ {
+role puppetmaster::backend
 include standard
-include role::puppetmaster::backend
 }
 
 node 'stat1001.eqiad.wmnet' {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3aa76b4b69f6d128b54d40a3ac0463d706df372
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use the role keyword for puppetmaster backends - change (operations/puppet)

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

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

Change subject: Use the role keyword for puppetmaster backends
..

Use the role keyword for puppetmaster backends

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

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/247232/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 870d859..165c9ac 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2388,8 +2388,8 @@
 }
 
 node /^(strontium|rhodium).eqiad.wmnet/ {
+role puppetmaster::backend
 include standard
-include role::puppetmaster::backend
 }
 
 node 'stat1001.eqiad.wmnet' {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3aa76b4b69f6d128b54d40a3ac0463d706df372
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