Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/252404
Change subject: Assign salt grains for ipsec test hosts ...................................................................... Assign salt grains for ipsec test hosts Change-Id: I7c5f0cc27a6bf9397df117e8034435d908b1fb19 --- M hieradata/hosts/berkelium.yaml M hieradata/hosts/curium.yaml M modules/debdeploy/templates/debdeploy.erb 3 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/04/252404/1 diff --git a/hieradata/hosts/berkelium.yaml b/hieradata/hosts/berkelium.yaml index 367063e..e8820f1 100644 --- a/hieradata/hosts/berkelium.yaml +++ b/hieradata/hosts/berkelium.yaml @@ -2,3 +2,6 @@ role::ipsec::hosts: - 'berkelium.eqiad.wmnet' - 'curium.eqiad.wmnet' +debdeploy::grains: + debdeploy-ipsec-test: + value: standard diff --git a/hieradata/hosts/curium.yaml b/hieradata/hosts/curium.yaml index 367063e..e8820f1 100644 --- a/hieradata/hosts/curium.yaml +++ b/hieradata/hosts/curium.yaml @@ -2,3 +2,6 @@ role::ipsec::hosts: - 'berkelium.eqiad.wmnet' - 'curium.eqiad.wmnet' +debdeploy::grains: + debdeploy-ipsec-test: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index b5bafac..f0a299d 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -12,7 +12,7 @@ misc-analytics = debdeploy-kafkatee:standard, debdeploy-hue:standard, debdeploy-xenon:standard, debdeploy-mysql-analytics:standard, debdeploy-impala:standard, debdeploy-spark-worker:standard misc-others = debdeploy-spare:standard, debdeploy-testsystem: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 -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 +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 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/252404 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c5f0cc27a6bf9397df117e8034435d908b1fb19 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
