Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/248333
Change subject: Assign salt grains for terbium ...................................................................... Assign salt grains for terbium Change-Id: Ib592b6313f0c723737f984bda270a402bd0a210f --- A hieradata/role/common/db/maintenance.yaml A hieradata/role/common/ganglia/web.yaml M modules/debdeploy/templates/debdeploy.erb 3 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/33/248333/1 diff --git a/hieradata/role/common/db/maintenance.yaml b/hieradata/role/common/db/maintenance.yaml new file mode 100644 index 0000000..51651ef --- /dev/null +++ b/hieradata/role/common/db/maintenance.yaml @@ -0,0 +1,3 @@ +debdeploy::grains: + debdeploy-db-maintenance: + value: standard diff --git a/hieradata/role/common/ganglia/web.yaml b/hieradata/role/common/ganglia/web.yaml new file mode 100644 index 0000000..6d5a8ad --- /dev/null +++ b/hieradata/role/common/ganglia/web.yaml @@ -0,0 +1,3 @@ +debdeploy::grains: + debdeploy-ganglia: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index 6fd5b04..7a0ab6b 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, debdeploy-gerrit: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, debdeploy-ganglia:standard, debdeploy-db-maintenance: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/248333 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib592b6313f0c723737f984bda270a402bd0a210f 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
