Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/248330
Change subject: Assign salt grains for gerrit ...................................................................... Assign salt grains for gerrit Change-Id: I2e61af9cf69648e71c86117bdfd1bfc10c222c46 --- M hieradata/role/common/gerrit/production.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/30/248330/1 diff --git a/hieradata/role/common/gerrit/production.yaml b/hieradata/role/common/gerrit/production.yaml index af20d47..98b01a8 100644 --- a/hieradata/role/common/gerrit/production.yaml +++ b/hieradata/role/common/gerrit/production.yaml @@ -1,3 +1,6 @@ admin::groups: - gerrit-root - gerrit-admin +debdeploy::grains: + debdeploy-gerrit: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index f5c205c..45790a2 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, debdeploy-deployment:standard, debdeploy-packagebuild:standard, debdeploy-racktables:standard, debdeploy-syslog:standard, debdeploy-ipv6relay:standard, debdeploy-archiva:standard, debdeploy-pmacct:standard, debdeploy-labmon:standard, debdeploy-nova-control:standard, debdeploy-bugzilla:standard, debdeploy-installserver:standard, debdeploy-xenon:standard, debdeploy-icinga:standard, debdeploy-kafkatee: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, debdeploy-packagebuild:standard, debdeploy-racktables:standard, debdeploy-syslog:standard, debdeploy-ipv6relay:standard, debdeploy-archiva:standard, debdeploy-pmacct:standard, debdeploy-labmon:standard, debdeploy-nova-control:standard, debdeploy-bugzilla:standard, debdeploy-installserver:standard, debdeploy-xenon:standard, debdeploy-icinga:standard, debdeploy-kafkatee:standard, debdeploy-gerrit: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/248330 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e61af9cf69648e71c86117bdfd1bfc10c222c46 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
