Elukey has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/393611 )
Change subject: Move journalnode's config from cdh::hadoop to cdh::hadoop:worker
......................................................................
Move journalnode's config from cdh::hadoop to cdh::hadoop:worker
Bug: T167790
Change-Id: Ifc285ac41ee7af1d622292a0cb69edb081b2a09d
---
M README.md
M manifests/hadoop.pp
M manifests/hadoop/worker.pp
3 files changed, 11 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/cdh
refs/changes/11/393611/1
diff --git a/README.md b/README.md
index 4e7b146..338d79c 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@
```zookeeper_hosts``` and configuring the JournalNodes.
Your JournalNodes will be automatically configured based on the value of
-```$cdh::hadoop::journalnode_hosts```. When ```cdh::hadoop``` is included,
+```$cdh::hadoop::journalnode_hosts```. When ```cdh::hadoop::worker``` is
included,
if the current hostname or IP address matches a value in the $journalnode_hosts
array, then ```cdh::hadoop::journalnode``` will be included.
diff --git a/manifests/hadoop.pp b/manifests/hadoop.pp
index 8fee325..72734ed 100644
--- a/manifests/hadoop.pp
+++ b/manifests/hadoop.pp
@@ -334,15 +334,4 @@
ensure => $hadoop_metrics2_ensure,
content => template('cdh/hadoop/hadoop-metrics2.properties.erb'),
}
-
- # If the current node is meant to be JournalNode,
- # include the journalnode class. JournalNodes can
- # be started at any time.
- if ($journalnode_hosts and (
- ($::fqdn and $::fqdn in $journalnode_hosts) or
- ($::ipaddress and $::ipaddress in $journalnode_hosts) or
- ($::ipaddress_eth1 and $::ipaddress_eth1 in $journalnode_hosts)))
- {
- include cdh::hadoop::journalnode
- }
}
diff --git a/manifests/hadoop/worker.pp b/manifests/hadoop/worker.pp
index dd4b873..93ffca4 100644
--- a/manifests/hadoop/worker.pp
+++ b/manifests/hadoop/worker.pp
@@ -22,4 +22,14 @@
class { 'cdh::hadoop::nodemanager':
require => Cdh::Hadoop::Worker::Paths[$::cdh::hadoop::datanode_mounts],
}
+
+ $journalnode_hosts = $::cdh::hadoop::defaults::journalnode_hosts
+
+ if ($journalnode_hosts and (
+ ($::fqdn and $::fqdn in $journalnode_hosts) or
+ ($::ipaddress and $::ipaddress in $journalnode_hosts) or
+ ($::ipaddress_eth1 and $::ipaddress_eth1 in $journalnode_hosts)))
+ {
+ class { 'cdh::hadoop::journalnode:' }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/393611
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc285ac41ee7af1d622292a0cb69edb081b2a09d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cdh
Gerrit-Branch: master
Gerrit-Owner: Elukey <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
