diff options
| author | Cos <cos@apache.org> | 2016-01-20 09:31:54 -0800 |
|---|---|---|
| committer | Cos <cos@apache.org> | 2016-01-20 09:31:54 -0800 |
| commit | 0785780af0bf4bb999ddc1eded5fabb822c0221d (patch) | |
| tree | 95127163f99f9d5293200a206ae22a7591f50007 /bigtop-deploy | |
| parent | 353a82692563d7041a0bef5f7f7028e3da71ff47 (diff) | |
| parent | 815908d433baf9a754c74e26ac2aafe883fe800a (diff) | |
Merge pull request #16 from odpi/master
Routine syncronization, ready to go
Diffstat (limited to 'bigtop-deploy')
| -rw-r--r-- | bigtop-deploy/puppet/modules/hadoop/files/hdfs/id_hdfsuser (renamed from bigtop-deploy/puppet/config/hdfs/id_hdfsuser) | 0 | ||||
| -rw-r--r-- | bigtop-deploy/puppet/modules/hadoop/files/hdfs/id_hdfsuser.pub (renamed from bigtop-deploy/puppet/config/hdfs/id_hdfsuser.pub) | 0 | ||||
| -rw-r--r-- | bigtop-deploy/puppet/modules/hadoop/manifests/init.pp | 8 |
3 files changed, 4 insertions, 4 deletions
diff --git a/bigtop-deploy/puppet/config/hdfs/id_hdfsuser b/bigtop-deploy/puppet/modules/hadoop/files/hdfs/id_hdfsuser index 2a7c35fa..2a7c35fa 100644 --- a/bigtop-deploy/puppet/config/hdfs/id_hdfsuser +++ b/bigtop-deploy/puppet/modules/hadoop/files/hdfs/id_hdfsuser diff --git a/bigtop-deploy/puppet/config/hdfs/id_hdfsuser.pub b/bigtop-deploy/puppet/modules/hadoop/files/hdfs/id_hdfsuser.pub index 8e279db5..8e279db5 100644 --- a/bigtop-deploy/puppet/config/hdfs/id_hdfsuser.pub +++ b/bigtop-deploy/puppet/modules/hadoop/files/hdfs/id_hdfsuser.pub diff --git a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp index 5703db9a..64b3ee69 100644 --- a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp @@ -244,8 +244,8 @@ class hadoop ($hadoop_security_authentication = "simple", $ssh_user_home = "/var/lib/hadoop-hdfs" $ssh_user_keydir = "$ssh_user_home/.ssh" $ssh_keypath = "$ssh_user_keydir/id_hdfsuser" - $ssh_privkey = "hdfs/id_hdfsuser" - $ssh_pubkey = "hdfs/id_hdfsuser.pub" + $ssh_privkey = "hadoop/hdfs/id_hdfsuser" + $ssh_pubkey = "hadoop/hdfs/id_hdfsuser.pub" file { $ssh_user_keydir: ensure => directory, @@ -256,7 +256,7 @@ class hadoop ($hadoop_security_authentication = "simple", } file { $ssh_keypath: - source => "puppet:///files/$ssh_privkey", + source => "puppet:///modules/$ssh_privkey", owner => 'hdfs', group => 'hdfs', mode => '0600', @@ -264,7 +264,7 @@ class hadoop ($hadoop_security_authentication = "simple", } file { "$ssh_user_keydir/authorized_keys": - source => "puppet:///files/$ssh_pubkey", + source => "puppet:///modules/$ssh_pubkey", owner => 'hdfs', group => 'hdfs', mode => '0600', |