Muehlenhoff has submitted this change and it was merged.
Change subject: Also split video scaler in eqiad/codfw-specific grains as
already done for the other mediawiki grains used in debdeploy
......................................................................
Also split video scaler in eqiad/codfw-specific grains as already done for
the other mediawiki grains used in debdeploy
Change-Id: I72e5ef0bb61d37ee2cf914a8435aa8075a8d963c
---
A hieradata/role/codfw/mediawiki/videoscaler.yaml
M hieradata/role/common/mediawiki/videoscaler.yaml
A hieradata/role/eqiad/mediawiki/videoscaler.yaml
M modules/debdeploy/templates/debdeploy.erb
4 files changed, 13 insertions(+), 8 deletions(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/codfw/mediawiki/videoscaler.yaml
b/hieradata/role/codfw/mediawiki/videoscaler.yaml
new file mode 100644
index 0000000..5bff589
--- /dev/null
+++ b/hieradata/role/codfw/mediawiki/videoscaler.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+ debdeploy-videoscaler-codfw:
+ value: standard
diff --git a/hieradata/role/common/mediawiki/videoscaler.yaml
b/hieradata/role/common/mediawiki/videoscaler.yaml
index c5fffee..585b2ce 100644
--- a/hieradata/role/common/mediawiki/videoscaler.yaml
+++ b/hieradata/role/common/mediawiki/videoscaler.yaml
@@ -9,6 +9,3 @@
server:
connection_timeout_seconds: 1200
max_execution_time: 1200
-debdeploy::grains:
- debdeploy-videoscaler:
- value: standard
diff --git a/hieradata/role/eqiad/mediawiki/videoscaler.yaml
b/hieradata/role/eqiad/mediawiki/videoscaler.yaml
new file mode 100644
index 0000000..7fd2946
--- /dev/null
+++ b/hieradata/role/eqiad/mediawiki/videoscaler.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+ debdeploy-videoscaler-eqiad:
+ value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb
b/modules/debdeploy/templates/debdeploy.erb
index 8a3280f..dae2d8a 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -33,8 +33,6 @@
scb = debdeploy-scb:standard, debdeploy-scb:canary
scb-canary = debdeploy-scb:canary
all-sc = debdeploy-sca:standard, debdeploy-sca:canary, debdeploy-scb:standard,
debdeploy-scb:canary
-videoscaler = debdeploy-videoscaler:standard, debdeploy-videoscaler:canary
-videoscaler-canary = debdeploy-videoscaler:canary
dumps = debdeploy-dumps:standard
eventlogging = debdeploy-eventlogging:standard
ganeti = debdeploy-ganeti:standard, debdeploy-ganeti:canary
@@ -110,13 +108,17 @@
poolcounter = debdeploy-poolcounter-eqiad:standard,
debdeploy-poolcounter-codfw:standard
poolcounter-eqiad = debdeploy-poolcounter-eqiad:standard
poolcounter-codfw = debdeploy-poolcounter-codfw:standard
+videoscaler = debdeploy-videoscaler-eqiad:standard,
debdeploy-videoscaler-codfw:standard, debdeploy-videoscaler:canary
+videoscaler-eqiad = debdeploy-videoscaler-eqiad:standard
+videoscaler-codfw = debdeploy-videoscaler-codfw:standard
+videoscaler-canary = debdeploy-videoscaler:canary
imagescaler = debdeploy-imagescaler-eqiad:standard,
debdeploy-imagescaler-codfw:standard, debdeploy-imagescaler-eqiad:canary,
debdeploy-imagescaler-codfw:canary
imagescaler-eqiad = debdeploy-imagescaler-eqiad:standard,
debdeploy-imagescaler-eqiad:canary
imagescaler-codfw = debdeploy-imagescaler-codfw:standard,
debdeploy-imagescaler-codfw:canary
imagescaler-canary = debdeploy-imagescaler-eqiad:canary,
debdeploy-imagescaler-codfw:canary
-all-mw = debdeploy-appserverapi-eqiad:standard,
debdeploy-appserverapi:single_canary, debdeploy-appserverapi-eqiad:canary,
debdeploy-jobrunner-eqiad:standard, debdeploy-jobrunner-eqiad:canary,
debdeploy-appserver-eqiad:standard, debdeploy-appserver-eqiad:canary,
debdeploy-appserver:single_canary, debdeploy-imagescaler-eqiad:standard,
debdeploy-imagescaler-eqiad:canary, debdeploy-appserverapi-codfw:standard,
debdeploy-jobrunner-codfw:standard, debdeploy-appserver-codfw:standard,
debdeploy-imagescaler-codfw:standard, debdeploy-imagescaler-codfw:canary
-all-mw-eqiad = debdeploy-appserverapi-eqiad:standard,
debdeploy-appserverapi:single_canary, debdeploy-appserverapi-eqiad:canary,
debdeploy-jobrunner-eqiad:standard, debdeploy-jobrunner-eqiad:canary,
debdeploy-appserver-eqiad:standard, debdeploy-appserver-eqiad:canary,
debdeploy-appserver:single_canary, debdeploy-imagescaler-eqiad:standard,
debdeploy-imagescaler-eqiad:canary
-all-mw-codfw = debdeploy-appserverapi-codfw:standard,
debdeploy-jobrunner-codfw:standard, debdeploy-appserver-codfw:standard,
debdeploy-imagescaler-codfw:standard, debdeploy-imagescaler-codfw:canary
+all-mw = debdeploy-appserverapi-eqiad:standard,
debdeploy-appserverapi:single_canary, debdeploy-appserverapi-eqiad:canary,
debdeploy-jobrunner-eqiad:standard, debdeploy-jobrunner-eqiad:canary,
debdeploy-appserver-eqiad:standard, debdeploy-appserver-eqiad:canary,
debdeploy-appserver:single_canary, debdeploy-imagescaler-eqiad:standard,
debdeploy-imagescaler-eqiad:canary, debdeploy-appserverapi-codfw:standard,
debdeploy-jobrunner-codfw:standard, debdeploy-appserver-codfw:standard,
debdeploy-imagescaler-codfw:standard, debdeploy-imagescaler-codfw:canary,
debdeploy-videoscaler-eqiad:standard, debdeploy-videoscaler-codfw:standard,
debdeploy-videoscaler:canary
+all-mw-eqiad = debdeploy-appserverapi-eqiad:standard,
debdeploy-appserverapi:single_canary, debdeploy-appserverapi-eqiad:canary,
debdeploy-jobrunner-eqiad:standard, debdeploy-jobrunner-eqiad:canary,
debdeploy-appserver-eqiad:standard, debdeploy-appserver-eqiad:canary,
debdeploy-appserver:single_canary, debdeploy-imagescaler-eqiad:standard,
debdeploy-imagescaler-eqiad:canary, debdeploy-videoscaler-eqiad:standard
+all-mw-codfw = debdeploy-appserverapi-codfw:standard,
debdeploy-jobrunner-codfw:standard, debdeploy-appserver-codfw:standard,
debdeploy-imagescaler-codfw:standard, debdeploy-imagescaler-codfw:canary,
debdeploy-videoscaler-codfw:standard
mw-api-eqiad = debdeploy-appserverapi-eqiad:standard
mw-api-codfw = debdeploy-appserverapi-codfw:standard
mw-api = debdeploy-appserverapi-codfw:standard,
debdeploy-appserverapi-eqiad:standard, debdeploy-appserverapi:single_canary,
debdeploy-appserverapi-eqiad:canary
--
To view, visit https://gerrit.wikimedia.org/r/272717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72e5ef0bb61d37ee2cf914a8435aa8075a8d963c
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
