Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/247814
Change subject: Assign salt grains for planet ...................................................................... Assign salt grains for planet Change-Id: I06e8bd9f12f4b9aae7fc66650363f93316c02d6d --- A hieradata/role/common/planet.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/14/247814/1 diff --git a/hieradata/role/common/planet.yaml b/hieradata/role/common/planet.yaml new file mode 100644 index 0000000..f5eb852 --- /dev/null +++ b/hieradata/role/common/planet.yaml @@ -0,0 +1,3 @@ +debdeploy::grains: + debdeploy-planet: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index 5d82dc6..51ab9d8 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -6,7 +6,7 @@ # A list of servers, each defined by one or more Salt grains. If multiple grains # are specified, they're processed sequentially analytics = debdeploy-analytics:true -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 +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 swift = debdeploy-swift-proxy:true, debdeploy-swift-storage:true swift-storage = debdeploy-swift-storage:true swift-proxy = debdeploy-swift-proxy:true -- To view, visit https://gerrit.wikimedia.org/r/247814 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06e8bd9f12f4b9aae7fc66650363f93316c02d6d 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
