Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/246944
Change subject: Add salt grains for hadoop workers ...................................................................... Add salt grains for hadoop workers Change-Id: I1797d56e1989a42cc06aeccc19b20a240de08a48 --- A hieradata/hosts/analytics1030.yaml M hieradata/role/common/analytics/hadoop/worker.yaml M modules/debdeploy/templates/debdeploy.erb 3 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/44/246944/1 diff --git a/hieradata/hosts/analytics1030.yaml b/hieradata/hosts/analytics1030.yaml new file mode 100644 index 0000000..0dd3de6 --- /dev/null +++ b/hieradata/hosts/analytics1030.yaml @@ -0,0 +1,3 @@ +debdeploy::grains: + debdeploy-hadoop-worker: + value: canary diff --git a/hieradata/role/common/analytics/hadoop/worker.yaml b/hieradata/role/common/analytics/hadoop/worker.yaml index 020174f..25d88ba 100644 --- a/hieradata/role/common/analytics/hadoop/worker.yaml +++ b/hieradata/role/common/analytics/hadoop/worker.yaml @@ -3,6 +3,9 @@ admin::groups: - analytics-roots - analytics-admins +debdeploy::grains: + debdeploy-hadoop-worker: + value: standard # Analytics worker disks are large. We will install a custom # NRPE check for them, so the base module's should ignore them. diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index b4b49a4..674cd14 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -11,3 +11,6 @@ swift-storage = debdeploy-swift-storage:true swift-proxy = debdeploy-swift-proxy:true memcached = debdeploy-memcached:true +hadoop-worker = debdeploy-hadoop-worker:standard +hadoop-worker-canary = debdeploy-hadoop-worker:canary +hadoop = debdeploy-hadoop-worker:standard -- To view, visit https://gerrit.wikimedia.org/r/246944 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1797d56e1989a42cc06aeccc19b20a240de08a48 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
