Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/247877
Change subject: Assign salt grains for deployment servers ...................................................................... Assign salt grains for deployment servers Change-Id: I1916ee2e72c41b6ae2946093dd7b8c3698eb8d14 --- M hieradata/role/common/deployment/server.yaml M modules/debdeploy/templates/debdeploy.erb 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/77/247877/1 diff --git a/hieradata/role/common/deployment/server.yaml b/hieradata/role/common/deployment/server.yaml index 2304440..9595839 100644 --- a/hieradata/role/common/deployment/server.yaml +++ b/hieradata/role/common/deployment/server.yaml @@ -4,3 +4,6 @@ - parsoid-admin - ocg-render-admins - wdqs-admins +debdeploy::grains: + debdeploy-deployment: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index d42b8bf..f7274a4 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, debdeploy-irc: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, debdeploy-deployment: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/247877 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1916ee2e72c41b6ae2946093dd7b8c3698eb8d14 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
