Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/246945
Change subject: Add salt grains for hadoop master and standby ...................................................................... Add salt grains for hadoop master and standby Change-Id: Ia83e227cb45231ad895cf556ae3822a86c2e2c28 --- M hieradata/role/common/analytics/hadoop/master.yaml M hieradata/role/common/analytics/hadoop/standby.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/45/246945/1 diff --git a/hieradata/role/common/analytics/hadoop/master.yaml b/hieradata/role/common/analytics/hadoop/master.yaml index 4c1f11c..ba86c0d 100644 --- a/hieradata/role/common/analytics/hadoop/master.yaml +++ b/hieradata/role/common/analytics/hadoop/master.yaml @@ -5,5 +5,8 @@ - analytics-privatedata-users - analytics-roots - analytics-admins +debdeploy::grains: + debdeploy-hadoop-master: + value: standard diff --git a/hieradata/role/common/analytics/hadoop/standby.yaml b/hieradata/role/common/analytics/hadoop/standby.yaml index 4c1f11c..500a898 100644 --- a/hieradata/role/common/analytics/hadoop/standby.yaml +++ b/hieradata/role/common/analytics/hadoop/standby.yaml @@ -5,5 +5,8 @@ - analytics-privatedata-users - analytics-roots - analytics-admins +debdeploy::grains: + debdeploy-hadoop-standby: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index 674cd14..98f4361 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -13,4 +13,4 @@ memcached = debdeploy-memcached:true hadoop-worker = debdeploy-hadoop-worker:standard hadoop-worker-canary = debdeploy-hadoop-worker:canary -hadoop = debdeploy-hadoop-worker:standard +hadoop = debdeploy-hadoop-worker:standard, debdeploy-hadoop-master:standard, debdeploy-hadoop-standby:standard -- To view, visit https://gerrit.wikimedia.org/r/246945 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia83e227cb45231ad895cf556ae3822a86c2e2c28 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
