Muehlenhoff has submitted this change and it was merged. Change subject: Assign salt grains for otrs ......................................................................
Assign salt grains for otrs Change-Id: I9117a2eada2c9b252a687e81a81f96958907bab4 --- M hieradata/role/common/otrs.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/otrs.yaml b/hieradata/role/common/otrs.yaml index 7ad0377..3b854f3 100644 --- a/hieradata/role/common/otrs.yaml +++ b/hieradata/role/common/otrs.yaml @@ -1 +1,4 @@ standard::has_default_mail_relay: false +debdeploy::grains: + debdeploy-otrs: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index 891e691..2b22399 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 +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 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/247551 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9117a2eada2c9b252a687e81a81f96958907bab4 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org> Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
