[MediaWiki-commits] [Gerrit] helium: 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/247196

Change subject: helium: Use the role keyword
..

helium: Use the role keyword

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

Change-Id: Ic4cae81944146c722ea645bc3988e0a864ce2f83
---
M manifests/site.pp
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/247196/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 870d859..3aa270d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1064,11 +1064,10 @@
 
 # poolcounter - careful
 node 'helium.eqiad.wmnet' {
+role poolcounter, backup::director, backup::storage
+
 include standard
 include base::firewall
-include role::poolcounter
-include role::backup::director
-include role::backup::storage
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',
 }

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

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

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

2015-10-19 Thread Alexandros Kosiaris (Code Review) 
Alexandros Kosiaris has submitted this change and it was merged.

Change subject: helium: Use the role keyword
..


helium: Use the role keyword

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

Change-Id: Ic4cae81944146c722ea645bc3988e0a864ce2f83
---
M manifests/site.pp
1 file changed, 2 insertions(+), 3 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index caa053c..d8ddee4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1064,11 +1064,10 @@
 
 # poolcounter - careful
 node 'helium.eqiad.wmnet' {
+role poolcounter, backup::director, backup::storage
+
 include standard
 include base::firewall
-include role::poolcounter
-include role::backup::director
-include role::backup::storage
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',
 }

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

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

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