[MediaWiki-commits] [Gerrit] Assign salt grains for graphite - change (operations/puppet)

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

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

Change subject: Assign salt grains for graphite
..

Assign salt grains for graphite

Change-Id: I6295349842f2ee91b24994ff28233752a76cb97c
---
M modules/debdeploy/templates/debdeploy.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/248847/1

diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index dba83d2..7919114 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -5,7 +5,7 @@
 [serverlists]
 # A list of servers, each defined by one or more Salt grains. If multiple 
grains
 # are specified, they're processed sequentially
-misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard, 
debdeploy-gerrit:standard, debdeploy-ganglia:standard, 
debdeploy-db-maintenance:standard, debdeploy-hue:standard, 
debdeploy-ci:standard, debdeploy-librenms:standard
+misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard, 
debdeploy-gerrit:standard, debdeploy-ganglia:standard, 
debdeploy-db-maintenance:standard, debdeploy-hue:standard, 
debdeploy-ci:standard, debdeploy-librenms:standard, debdeploy-graphite:standard
 hadoop-worker = debdeploy-hadoop-worker:standard
 hadoop-worker-canary = debdeploy-hadoop-worker:canary
 hadoop-master = debdeploy-hadoop-master:standard

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6295349842f2ee91b24994ff28233752a76cb97c
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] Assign salt grains for graphite - change (operations/puppet)

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

Change subject: Assign salt grains for graphite
..


Assign salt grains for graphite

Change-Id: I6295349842f2ee91b24994ff28233752a76cb97c
---
A hieradata/role/common/graphite/production.yaml
M modules/debdeploy/templates/debdeploy.erb
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/graphite/production.yaml 
b/hieradata/role/common/graphite/production.yaml
new file mode 100644
index 000..f80f424
--- /dev/null
+++ b/hieradata/role/common/graphite/production.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-graphite:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index dba83d2..7919114 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -5,7 +5,7 @@
 [serverlists]
 # A list of servers, each defined by one or more Salt grains. If multiple 
grains
 # are specified, they're processed sequentially
-misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard, 
debdeploy-gerrit:standard, debdeploy-ganglia:standard, 
debdeploy-db-maintenance:standard, debdeploy-hue:standard, 
debdeploy-ci:standard, debdeploy-librenms:standard
+misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard, 
debdeploy-gerrit:standard, debdeploy-ganglia:standard, 
debdeploy-db-maintenance:standard, debdeploy-hue:standard, 
debdeploy-ci:standard, debdeploy-librenms:standard, debdeploy-graphite:standard
 hadoop-worker = debdeploy-hadoop-worker:standard
 hadoop-worker-canary = debdeploy-hadoop-worker:canary
 hadoop-master = debdeploy-hadoop-master:standard

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

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

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