Muehlenhoff has submitted this change and it was merged. Change subject: Add salt grain for alsafi and use it in debdeploy ......................................................................
Add salt grain for alsafi and use it in debdeploy Change-Id: I6529c31cde0503eab34ede0b07f963dcfabc7c97 --- A hieradata/hosts/alsafi.yaml M modules/debdeploy/templates/debdeploy.erb 2 files changed, 5 insertions(+), 1 deletion(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved diff --git a/hieradata/hosts/alsafi.yaml b/hieradata/hosts/alsafi.yaml new file mode 100644 index 0000000..f8b431d --- /dev/null +++ b/hieradata/hosts/alsafi.yaml @@ -0,0 +1,4 @@ +# Not assigned via the role since chromium/hydrogen use the same role along with the dnsrecursor role +debdeploy::grains: + debdeploy-urldownloader: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index e7ac5c6..612d4d8 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -13,7 +13,7 @@ all-analytics = debdeploy-kafkatee:standard, debdeploy-hue:standard, debdeploy-xenon:standard, debdeploy-mysql-analytics:standard, debdeploy-impala:standard, debdeploy-spark-worker:standard, debdeploy-hadoop-worker:standard, debdeploy-hadoop-master:standard, debdeploy-hadoop-standby:standard, debdeploy-hadoop-worker:canary misc-others = debdeploy-spare:standard, debdeploy-testsystem:standard, debdeploy-labsnfs:standard misc-devel = debdeploy-bugzilla:standard, debdeploy-ci:standard, debdeploy-gitblit:standard, debdeploy-releases:standard, debdeploy-ve:standard, debdeploy-irc:standard, debdeploy-phabricator:standard, debdeploy-gerrit:standard, debdeploy-archiva:standard, debdeploy-rcstream:standard, debdeploy-eventlogging:standard, debdeploy-deployment:standard, debdeploy-piwik:standard, debdeploy-zuulmerger:standard -misc-ops = debdeploy-packagebuild:standard, debdeploy-racktables:standard, debdeploy-db-maintenance:standard, debdeploy-pmacct:standard, debdeploy-installserver:standard, debdeploy-librenms:standard, debdeploy-backup-storage:standard, debdeploy-ipsec-test:standard, debdeploy-tftpserver:standard, debdeploy-saltmaster:standard +misc-ops = debdeploy-packagebuild:standard, debdeploy-racktables:standard, debdeploy-db-maintenance:standard, debdeploy-pmacct:standard, debdeploy-installserver:standard, debdeploy-librenms:standard, debdeploy-backup-storage:standard, debdeploy-ipsec-test:standard, debdeploy-tftpserver:standard, debdeploy-saltmaster:standard, debdeploy-urldownloader:standard deployment-servers = debdeploy-deployment:standard hadoop-worker = debdeploy-hadoop-worker:standard, debdeploy-hadoop-worker:canary hadoop-worker-canary = debdeploy-hadoop-worker:canary -- To view, visit https://gerrit.wikimedia.org/r/272715 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6529c31cde0503eab34ede0b07f963dcfabc7c97 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
