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

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

Change subject: fluorine: Use the role keyword
..


fluorine: Use the role keyword

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

Change-Id: If4fc6dcc557e5c8e00fc09ceccafab7528eb1b5f
---
M manifests/site.pp
1 file changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 25067d0..43e4ef2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -963,17 +963,15 @@
 }
 
 node 'fluorine.eqiad.wmnet' {
+role xenon, dataset::publicdirs
 $cluster = 'misc'
 
 include standard
-include ::role::xenon
-include role::dataset::publicdirs
 
 class { 'role::logging::mediawiki':
 monitor   => false,
 log_directory => '/a/mw-log',
 }
-
 }
 
 # ZIM dumps (https://en.wikipedia.org/wiki/ZIM_%28file_format%29)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If4fc6dcc557e5c8e00fc09ceccafab7528eb1b5f
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] fluorine: Use the role keyword - change (operations/puppet)

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

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

Change subject: fluorine: Use the role keyword
..

fluorine: Use the role keyword

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

Change-Id: If4fc6dcc557e5c8e00fc09ceccafab7528eb1b5f
---
M manifests/site.pp
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/246980/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 870d859..13cc97b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -976,17 +976,15 @@
 }
 
 node 'fluorine.eqiad.wmnet' {
+role xenon, dataset::publicdirs
 $cluster = 'misc'
 
 include standard
-include ::role::xenon
-include role::dataset::publicdirs
 
 class { 'role::logging::mediawiki':
 monitor   => false,
 log_directory => '/a/mw-log',
 }
-
 }
 
 # ZIM dumps (https://en.wikipedia.org/wiki/ZIM_%28file_format%29)

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

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