Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/248842
Change subject: Assign salt grains for image scalers ...................................................................... Assign salt grains for image scalers Change-Id: I67b9468adfecb20a656105f30f1450a20cc3477f --- A hieradata/hosts/mw1160.yaml A hieradata/hosts/mw2148.yaml A hieradata/role/codfw/mediawiki/imagescaler.yaml A hieradata/role/eqiad/mediawiki/imagescaler.yaml M modules/debdeploy/templates/debdeploy.erb 5 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/42/248842/1 diff --git a/hieradata/hosts/mw1160.yaml b/hieradata/hosts/mw1160.yaml new file mode 100644 index 0000000..c2f824e --- /dev/null +++ b/hieradata/hosts/mw1160.yaml @@ -0,0 +1,3 @@ +debdeploy::grains: + debdeploy-imagescaler-eqiad: + value: canary diff --git a/hieradata/hosts/mw2148.yaml b/hieradata/hosts/mw2148.yaml new file mode 100644 index 0000000..f3cecf3 --- /dev/null +++ b/hieradata/hosts/mw2148.yaml @@ -0,0 +1,3 @@ +debdeploy::grains: + debdeploy-imagescaler-codfw: + value: canary diff --git a/hieradata/role/codfw/mediawiki/imagescaler.yaml b/hieradata/role/codfw/mediawiki/imagescaler.yaml new file mode 100644 index 0000000..e56d3ac --- /dev/null +++ b/hieradata/role/codfw/mediawiki/imagescaler.yaml @@ -0,0 +1,4 @@ +debdeploy::grains: + debdeploy-imagescaler-codfw: + value: standard + diff --git a/hieradata/role/eqiad/mediawiki/imagescaler.yaml b/hieradata/role/eqiad/mediawiki/imagescaler.yaml new file mode 100644 index 0000000..74298c9 --- /dev/null +++ b/hieradata/role/eqiad/mediawiki/imagescaler.yaml @@ -0,0 +1,4 @@ +debdeploy::grains: + debdeploy-imagescaler-eqiad: + value: standard + diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index a4aafea..6ff8af2 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -88,3 +88,7 @@ spark = debdeploy-spark-worker:standard poolcounter-eqiad = debdeploy-poolcounter-eqiad:standard poolcounter-codfw = debdeploy-poolcounter-codfw:standard +imagescaler = debdeploy-imagescaler-eqiad:standard, debdeploy-imagescaler-codfw:standard +imagescaler-eqiad = debdeploy-imagescaler-eqiad:standard +imagescaler-codfw = debdeploy-imagescaler-codfw:standard +imagescaler-canary = debdeploy-imagescaler-eqiad:canary, debdeploy-imagescaler-codfw:canary -- To view, visit https://gerrit.wikimedia.org/r/248842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I67b9468adfecb20a656105f30f1450a20cc3477f 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
