Muehlenhoff has submitted this change and it was merged. Change subject: Assign salt grains for phabricator ......................................................................
Assign salt grains for phabricator Change-Id: I6210c2306c311b8d69d17cd32b03ae7a0a13ef4a --- M hieradata/role/common/phabricator/main.yaml M modules/debdeploy/templates/debdeploy.erb 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/common/phabricator/main.yaml b/hieradata/role/common/phabricator/main.yaml index 16887b0..fa18bfe 100644 --- a/hieradata/role/common/phabricator/main.yaml +++ b/hieradata/role/common/phabricator/main.yaml @@ -4,3 +4,6 @@ - phabricator-roots apache::logrotate::period: "daily" apache::logrotate::rotate: 3 +debdeploy::grains: + debdeploy-phabricator: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index 2b22399..bc0859d 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 +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 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/247552 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6210c2306c311b8d69d17cd32b03ae7a0a13ef4a 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
