Repository: bigtop Updated Branches: refs/heads/master f9c0fcf20 -> f1f5619a3
BIGTOP-2547: Don't render ip-hostname-check in hdfs-site.xml if default Signed-off-by: Kevin W Monroe <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/f1f5619a Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/f1f5619a Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/f1f5619a Branch: refs/heads/master Commit: f1f5619a3a34e539a7b719712a885a26cdd161c4 Parents: f9c0fcf Author: Cory Johns <[email protected]> Authored: Mon Oct 3 10:43:54 2016 -0400 Committer: Kevin W Monroe <[email protected]> Committed: Tue Oct 4 11:21:52 2016 -0500 ---------------------------------------------------------------------- bigtop-deploy/puppet/modules/hadoop/manifests/init.pp | 2 +- bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/f1f5619a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp index 8e0de03..91fb4d0 100644 --- a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp @@ -229,7 +229,7 @@ class hadoop ($hadoop_security_authentication = "simple", $hadoop_http_authentication_signature_secret_file = "/etc/hadoop/conf/hadoop-http-authentication-signature-secret", $hadoop_http_authentication_cookie_domain = regsubst($fqdn, "^[^\\.]+\\.", ""), $generate_secrets = $hadoop::generate_secrets, - $namenode_datanode_registration_ip_hostname_check = true, + $namenode_datanode_registration_ip_hostname_check = undef, ) inherits hadoop { $sshfence_keydir = "$hadoop_ha_sshfence_user_home/.ssh" http://git-wip-us.apache.org/repos/asf/bigtop/blob/f1f5619a/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml b/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml index 8216eb4..9f3b3a5 100644 --- a/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml +++ b/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml @@ -298,9 +298,11 @@ <% end -%> <% end -%> +<% if not @namenode_datanode_registration_ip_hostname_check.nil? -%> <property> <name>dfs.namenode.datanode.registration.ip-hostname-check</name> <value><%= @namenode_datanode_registration_ip_hostname_check %></value> </property> +<% end -%> </configuration>
