Muehlenhoff has submitted this change and it was merged. Change subject: Assign salt grains for application servers ......................................................................
Assign salt grains for application servers Change-Id: I5cb39b57c8cb299356512851f31dc028285831e0 --- A hieradata/hosts/mw1030.yaml A hieradata/role/codfw/mediawiki/appserver.yaml A hieradata/role/eqiad/mediawiki/appserver.yaml A hieradata/role/eqiad/mediawiki/canary_appserver.yaml M modules/debdeploy/templates/debdeploy.erb 5 files changed, 21 insertions(+), 0 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/hosts/mw1030.yaml b/hieradata/hosts/mw1030.yaml new file mode 100644 index 0000000..e9bf63d --- /dev/null +++ b/hieradata/hosts/mw1030.yaml @@ -0,0 +1,3 @@ +debdeploy::grains: + debdeploy-appserver: + value: single_canary diff --git a/hieradata/role/codfw/mediawiki/appserver.yaml b/hieradata/role/codfw/mediawiki/appserver.yaml new file mode 100644 index 0000000..31c4dcf --- /dev/null +++ b/hieradata/role/codfw/mediawiki/appserver.yaml @@ -0,0 +1,4 @@ +debdeploy::grains: + debdeploy-appserver-codfw: + value: standard + diff --git a/hieradata/role/eqiad/mediawiki/appserver.yaml b/hieradata/role/eqiad/mediawiki/appserver.yaml new file mode 100644 index 0000000..85e639b --- /dev/null +++ b/hieradata/role/eqiad/mediawiki/appserver.yaml @@ -0,0 +1,4 @@ +debdeploy::grains: + debdeploy-appserver-eqiad: + value: standard + diff --git a/hieradata/role/eqiad/mediawiki/canary_appserver.yaml b/hieradata/role/eqiad/mediawiki/canary_appserver.yaml new file mode 100644 index 0000000..32d5ce1 --- /dev/null +++ b/hieradata/role/eqiad/mediawiki/canary_appserver.yaml @@ -0,0 +1,4 @@ +debdeploy::grains: + debdeploy-appserver-eqiad: + value: canary + diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index d6cce78..349b837 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -101,3 +101,9 @@ jobrunner-codfw = debdeploy-jobrunner-codfw:standard jobrunner= debdeploy-jobrunner-codfw:standard, debdeploy-jobrunner-eqiad:standard jobrunner-canary = debdeploy-jobrunner-eqiad:canary +mw-eqiad = debdeploy-appserver-eqiad:standard +mw-codfw = debdeploy-appserver-codfw:standard +mw = debdeploy-appserver-codfw:standard, debdeploy-appserver-eqiad:standard +mw-canary = debdeploy-appserver-eqiad:canary + +mw-canary-single = debdeploy-appserver:single_canary -- To view, visit https://gerrit.wikimedia.org/r/248845 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5cb39b57c8cb299356512851f31dc028285831e0 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
