Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grain for mw_rc_irc
......................................................................


Assign salt grain for mw_rc_irc

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

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved



diff --git a/hieradata/role/common/mw_rc_irc.yaml 
b/hieradata/role/common/mw_rc_irc.yaml
new file mode 100644
index 0000000..55deadf
--- /dev/null
+++ b/hieradata/role/common/mw_rc_irc.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-irc:
+    value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index a7584d7..d42b8bf 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
+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
 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/247854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I96a2db20d44bc6c2f5dd1676683be57393ce1155
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to