bigtop git commit: BIGTOP-1685: Remove useless use of explicit hiera lookup

[co...@apache.org]

Repository: bigtop
Updated Branches:
  refs/heads/master 495a7b5b9 -> d32c468e8


BIGTOP-1685: Remove useless use of explicit hiera lookup

Two explicit hiera lookups are left over from reworking the variable
lookup logic for ssh fencing key parameters. Those can go now.

Signed-off-by: Konstantin Boudnik <co...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/d32c468e
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/d32c468e
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/d32c468e

Branch: refs/heads/master
Commit: d32c468e8081f13c857c26b3d9ad1e0a5ad1ac38
Parents: 495a7b5
Author: Michael Weiser <m....@science-computing.de>
Authored: Thu Feb 19 17:23:25 2015 +0100
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Sun Mar 1 13:31:51 2015 -0800

----------------------------------------------------------------------
 bigtop-deploy/puppet/modules/hadoop/manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/d32c468e/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 bd6be18..eaca730 100644
--- a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
@@ -140,6 +140,8 @@ class hadoop ($hadoop_security_authentication = "simple",
       $shared_edits_dir = "/hdfs_shared",
       $testonly_hdfs_sshkeys  = "no",
       $hadoop_ha_sshfence_user_home = "/var/lib/hadoop-hdfs",
+      $sshfence_privkey = "hadoop/id_sshfence",
+      $sshfence_pubkey = "hadoop/id_sshfence.pub",
       $sshfence_user = "hdfs",
       $zk = $hadoop::zk,
       $hadoop_config_fs_inmemory_size_mb = undef,
@@ -152,8 +154,6 @@ class hadoop ($hadoop_security_authentication = "simple",
 
     $sshfence_keydir  = "$hadoop_ha_sshfence_user_home/.ssh"
     $sshfence_keypath = "$sshfence_keydir/id_sshfence"
-    $sshfence_privkey = hiera("hadoop::common_hdfs::sshfence_privkey", "hadoop/id_sshfence")
-    $sshfence_pubkey  = hiera("hadoop::common_hdfs::sshfence_pubkey", "hadoop/id_sshfence.pub")
 
     include common