Muehlenhoff has submitted this change and it was merged. Change subject: Assign salt grains for racktables ......................................................................
Assign salt grains for racktables Change-Id: Icd4fc4b1a6a80129ac5c4ddc2c7f2a86720aca73 --- M hieradata/role/common/racktables.yaml M modules/debdeploy/templates/debdeploy.erb 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved diff --git a/hieradata/role/common/racktables.yaml b/hieradata/role/common/racktables.yaml index 7ad0377..641618f 100644 --- a/hieradata/role/common/racktables.yaml +++ b/hieradata/role/common/racktables.yaml @@ -1 +1,4 @@ standard::has_default_mail_relay: false +debdeploy::grains: + debdeploy-racktables: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index fdfa824..1d7a1f5 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 +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 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/247881 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icd4fc4b1a6a80129ac5c4ddc2c7f2a86720aca73 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
