Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/248843
Change subject: Assign salt grains for mw api servers
......................................................................
Assign salt grains for mw api servers
Change-Id: I0afd68b60583521f8eb56c85c9b97e21a0767626
---
M hieradata/hosts/mw1114.yaml
A hieradata/role/eqiad/mediawiki/appserver/api.yaml
A hieradata/role/eqiad/mediawiki/appserver/canary_api.yaml
M modules/debdeploy/templates/debdeploy.erb
4 files changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/248843/1
diff --git a/hieradata/hosts/mw1114.yaml b/hieradata/hosts/mw1114.yaml
index f22a927..4ee0242 100644
--- a/hieradata/hosts/mw1114.yaml
+++ b/hieradata/hosts/mw1114.yaml
@@ -7,5 +7,8 @@
# Limit number of child processes running at once
# Also, use light processes, that are more efficient
light_process_count: "%{::processorcount}"
+debdeploy::grains:
+ debdeploy-appserverapi:
+ value: single_canary
diff --git a/hieradata/role/eqiad/mediawiki/appserver/api.yaml
b/hieradata/role/eqiad/mediawiki/appserver/api.yaml
new file mode 100644
index 0000000..c414a60
--- /dev/null
+++ b/hieradata/role/eqiad/mediawiki/appserver/api.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+ debdeploy-appserverapi-eqiad:
+ value: standard
+
diff --git a/hieradata/role/eqiad/mediawiki/appserver/canary_api.yaml
b/hieradata/role/eqiad/mediawiki/appserver/canary_api.yaml
new file mode 100644
index 0000000..6825605
--- /dev/null
+++ b/hieradata/role/eqiad/mediawiki/appserver/canary_api.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+ debdeploy-appserverapi-eqiad:
+ value: canary
+
diff --git a/modules/debdeploy/templates/debdeploy.erb
b/modules/debdeploy/templates/debdeploy.erb
index 6ff8af2..c243483 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -92,3 +92,8 @@
imagescaler-eqiad = debdeploy-imagescaler-eqiad:standard
imagescaler-codfw = debdeploy-imagescaler-codfw:standard
imagescaler-canary = debdeploy-imagescaler-eqiad:canary,
debdeploy-imagescaler-codfw:canary
+mw-api-eqiad = debdeploy-appserverapi-eqiad:standard
+mw-api-codfw = debdeploy-appserverapi-codfw:standard
+mw-api = debdeploy-appserverapi-codfw:standard,
debdeploy-appserverapi-eqiad:standard
+mw-api-canary = debdeploy-appserverapi-eqiad:canary
+mw-api-canary-single = debdeploy-appserverapi:single_canary
--
To view, visit https://gerrit.wikimedia.org/r/248843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0afd68b60583521f8eb56c85c9b97e21a0767626
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
