Muehlenhoff has submitted this change and it was merged. 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, 9 insertions(+), 1 deletion(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified 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..c3cbed9 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -13,4 +13,6 @@ memcached = debdeploy-memcached:true hadoop-worker = debdeploy-hadoop-worker:standard hadoop-worker-canary = debdeploy-hadoop-worker:canary -hadoop = debdeploy-hadoop-worker:standard +hadoop-master = debdeploy-hadoop-master:standard +hadoop-standby = debdeploy-hadoop-standby: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: merged Gerrit-Change-Id: Ia83e227cb45231ad895cf556ae3822a86c2e2c28 Gerrit-PatchSet: 3 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
