Muehlenhoff has submitted this change and it was merged. Change subject: Assign salt grains for dumps hosts ......................................................................
Assign salt grains for dumps hosts Change-Id: If4889d0a1e84796ad66775075cc1ad1dd55a496a --- M hieradata/role/common/dumps.yaml M hieradata/role/common/dumps/zim.yaml M modules/debdeploy/templates/debdeploy.erb 3 files changed, 7 insertions(+), 1 deletion(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/common/dumps.yaml b/hieradata/role/common/dumps.yaml index da9ee50..8884c25 100644 --- a/hieradata/role/common/dumps.yaml +++ b/hieradata/role/common/dumps.yaml @@ -15,3 +15,6 @@ - ftpmirror-ae0-4.us.your.org dumps::rsync_clients_ipv6: - odysseus.ip6.fi.muni.cz +debdeploy::grains: + debdeploy-dumps: + value: standard diff --git a/hieradata/role/common/dumps/zim.yaml b/hieradata/role/common/dumps/zim.yaml index aaac6aa..5d4e8c5 100644 --- a/hieradata/role/common/dumps/zim.yaml +++ b/hieradata/role/common/dumps/zim.yaml @@ -1,2 +1,5 @@ admin::groups: - htmldumps-admin +debdeploy::grains: + debdeploy-dumps: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index 0566ec4..0583c9b 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 +misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, debdeploy-gitblit:standard, debdeploy-spare:standard, debdeploy-releases:standard, debdeploy-testsystem:standard, debdeploy-dumps: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/247528 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If4889d0a1e84796ad66775075cc1ad1dd55a496a Gerrit-PatchSet: 3 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
