You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2016/01/19 22:55:00 UTC
[1/2] bigtop git commit: BIGTOP-2252. provisional hdfs ssh keys
couldn't be found during deployment
Repository: bigtop
Updated Branches:
refs/heads/master 670f5d8cb -> 815908d43
BIGTOP-2252. provisional hdfs ssh keys couldn't be found during deployment
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/6a185182
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/6a185182
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/6a185182
Branch: refs/heads/master
Commit: 6a1851824af5850c37c0d05d29d6a1663bdbef68
Parents: 670f5d8
Author: Konstantin Boudnik <co...@apache.org>
Authored: Fri Jan 15 20:20:38 2016 -0800
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Tue Jan 19 13:47:31 2016 -0800
----------------------------------------------------------------------
bigtop-deploy/puppet/config/hdfs/id_hdfsuser | 27 --------------------
.../puppet/config/hdfs/id_hdfsuser.pub | 1 -
.../modules/hadoop/files/hdfs/id_hdfsuser | 27 ++++++++++++++++++++
.../modules/hadoop/files/hdfs/id_hdfsuser.pub | 1 +
.../puppet/modules/hadoop/manifests/init.pp | 8 +++---
5 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a185182/bigtop-deploy/puppet/config/hdfs/id_hdfsuser
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/config/hdfs/id_hdfsuser b/bigtop-deploy/puppet/config/hdfs/id_hdfsuser
deleted file mode 100644
index 2a7c35f..0000000
--- a/bigtop-deploy/puppet/config/hdfs/id_hdfsuser
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAt6fOtyNM1yCgrdKIXzmZ4k00F2u/Fi5CARiZN8A2qD8vfRHa
-0sjyRRRuIJzTQArNiFS6TWJaTW7C19McCiaNGHHGAFeaxpzNjS56B8z+EfCG9vUP
-828i/81ED/+inOGSzRSBnivpxOgYNzaRwY/PxmjZ/9DRD6g6/2lqJu59j+gmXQqO
-rdyJFPPiGPQjEBJ2Yrg/hSdaq6/1YReh+C6AKWgIFdgv5CKrlutMM/OXGW9HhujX
-s0Hg7ewNeCcfGhPeatchTF0R8p7EoHLGrLwn+FtgTBvElo/NQN+pdwL8B7qXOKbr
-mNRY8xjdIrItBa4wa6V0B3JKo4YMnSCx+W68EwIDAQABAoIBACxhW727xQzTcKCw
-mI3SYJJkL6tdOS8F/KNBK31icJLVugcSMnvvXUQ+PKKa4x29vo8sUlzy4HmHw4Pe
-Gw+E42G91Kgug1NtfuqYCZsq+Vaidirla3ZbK+z+0GzBTK12gUAXrX7og7Q2let5
-v100AHSkz9FWx75t29vuwF0qEqOcgBKLNKHUAmd0i4fUE0wYiMOGO0Q5HOWv142V
-eFLSWZ3AG6F7uXyzhd24c8b5nHiQVrxOwIHoUSAQVsbbXnAnyeSQ0MaqJkfEsIGf
-CFIWFUKSqPVhMASBVazEO8WPNJHoO6sunVpLkk+Hjjw3QIt4U8HYB56unzuCbBMA
-50+HsrkCgYEA4QY/IwwQCKWZsosnIRgeFlCFH4Mz817E5lJq3vvuoyeCCGol1sCj
-tJW149que7MXt0lo0+R7TK3US7TlmJy9dbNP/fmlEAo6ne4hQ1+aosKANbvf+VmH
-Plvohox2YoihgtgbQhr60EVql8PJ4w2rVT5JsyGmzM0an9GNv2bqZiUCgYEA0O+9
-hBaxAHfGYEzwNlsDs6AX5BPrdvefFLln4q34Hg1tpYK+7L9jUGhZrFB0NCUjBf1N
-X7m/kCeQQD+HE8KqBzSyGSGxSKlySnKjFK86U9lY0maPBPeqREbPyGnc0qME4W9+
-SQWy7EBQDQY8envFge3iFzScJYcfDblO6+fNN9cCgYAH1dnY9JCSXIHPj7zbECXs
-DP21rTHf5YrhojkKbqdOkw+aD2gl5CtPHG9q8bBlqkTHIw09Y5VPhDYCNNhRyhNm
-x8mfRFQVDOYhnasW13tg83jXZiVUX2OwLi8YkEeHAs7s6W15jcrx+ZjOlAixmUY/
-/509WYyfUPz+V6Oh6Il86QKBgQCJOVvsPAcGeqQUrZN6763vtK7cQmT83sdhkh/z
-1jTGcCVadhO1ZEHzFoYG0VRwxw9IqMO/ojx5jjKEr/Skes63Ktnp/aH1SizhTodj
-V27kkTRwA6HdLlhqvWNMipLY2O6krVhw10hbOCYbV8Qy4cWnfzhl60y+rQ8tMU7v
-S3ASQwKBgFd+MdpochiSNbu+51RCVgnOyPahJmwstVq88p4PzdBNw7qlo5lWt30W
-EejN+fUR/dIZPy4M3nxH9W7n4QWqa8UiuNC1hFEQm/tnj7hKXu8P5jPXTcIJFusf
-d26rhw3MAbnwoqtRiyXxA6Teecq7RJH4I1+6RB1Y+jUeVO9rlmyA
------END RSA PRIVATE KEY-----
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a185182/bigtop-deploy/puppet/config/hdfs/id_hdfsuser.pub
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/config/hdfs/id_hdfsuser.pub b/bigtop-deploy/puppet/config/hdfs/id_hdfsuser.pub
deleted file mode 100644
index 8e279db..0000000
--- a/bigtop-deploy/puppet/config/hdfs/id_hdfsuser.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3p863I0zXIKCt0ohfOZniTTQXa78WLkIBGJk3wDaoPy99EdrSyPJFFG4gnNNACs2IVLpNYlpNbsLX0xwKJo0YccYAV5rGnM2NLnoHzP4R8Ib29Q/zbyL/zUQP/6Kc4ZLNFIGeK+nE6Bg3NpHBj8/GaNn/0NEPqDr/aWom7n2P6CZdCo6t3IkU8+IY9CMQEnZiuD+FJ1qrr/VhF6H4LoApaAgV2C/kIquW60wz85cZb0eG6NezQeDt7A14Jx8aE95q1yFMXRHynsSgcsasvCf4W2BMG8SWj81A36l3AvwHupc4puuY1FjzGN0isi0FrjBrpXQHckqjhgydILH5brwT hdfs dev ssh key
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a185182/bigtop-deploy/puppet/modules/hadoop/files/hdfs/id_hdfsuser
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hadoop/files/hdfs/id_hdfsuser b/bigtop-deploy/puppet/modules/hadoop/files/hdfs/id_hdfsuser
new file mode 100644
index 0000000..2a7c35f
--- /dev/null
+++ b/bigtop-deploy/puppet/modules/hadoop/files/hdfs/id_hdfsuser
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAt6fOtyNM1yCgrdKIXzmZ4k00F2u/Fi5CARiZN8A2qD8vfRHa
+0sjyRRRuIJzTQArNiFS6TWJaTW7C19McCiaNGHHGAFeaxpzNjS56B8z+EfCG9vUP
+828i/81ED/+inOGSzRSBnivpxOgYNzaRwY/PxmjZ/9DRD6g6/2lqJu59j+gmXQqO
+rdyJFPPiGPQjEBJ2Yrg/hSdaq6/1YReh+C6AKWgIFdgv5CKrlutMM/OXGW9HhujX
+s0Hg7ewNeCcfGhPeatchTF0R8p7EoHLGrLwn+FtgTBvElo/NQN+pdwL8B7qXOKbr
+mNRY8xjdIrItBa4wa6V0B3JKo4YMnSCx+W68EwIDAQABAoIBACxhW727xQzTcKCw
+mI3SYJJkL6tdOS8F/KNBK31icJLVugcSMnvvXUQ+PKKa4x29vo8sUlzy4HmHw4Pe
+Gw+E42G91Kgug1NtfuqYCZsq+Vaidirla3ZbK+z+0GzBTK12gUAXrX7og7Q2let5
+v100AHSkz9FWx75t29vuwF0qEqOcgBKLNKHUAmd0i4fUE0wYiMOGO0Q5HOWv142V
+eFLSWZ3AG6F7uXyzhd24c8b5nHiQVrxOwIHoUSAQVsbbXnAnyeSQ0MaqJkfEsIGf
+CFIWFUKSqPVhMASBVazEO8WPNJHoO6sunVpLkk+Hjjw3QIt4U8HYB56unzuCbBMA
+50+HsrkCgYEA4QY/IwwQCKWZsosnIRgeFlCFH4Mz817E5lJq3vvuoyeCCGol1sCj
+tJW149que7MXt0lo0+R7TK3US7TlmJy9dbNP/fmlEAo6ne4hQ1+aosKANbvf+VmH
+Plvohox2YoihgtgbQhr60EVql8PJ4w2rVT5JsyGmzM0an9GNv2bqZiUCgYEA0O+9
+hBaxAHfGYEzwNlsDs6AX5BPrdvefFLln4q34Hg1tpYK+7L9jUGhZrFB0NCUjBf1N
+X7m/kCeQQD+HE8KqBzSyGSGxSKlySnKjFK86U9lY0maPBPeqREbPyGnc0qME4W9+
+SQWy7EBQDQY8envFge3iFzScJYcfDblO6+fNN9cCgYAH1dnY9JCSXIHPj7zbECXs
+DP21rTHf5YrhojkKbqdOkw+aD2gl5CtPHG9q8bBlqkTHIw09Y5VPhDYCNNhRyhNm
+x8mfRFQVDOYhnasW13tg83jXZiVUX2OwLi8YkEeHAs7s6W15jcrx+ZjOlAixmUY/
+/509WYyfUPz+V6Oh6Il86QKBgQCJOVvsPAcGeqQUrZN6763vtK7cQmT83sdhkh/z
+1jTGcCVadhO1ZEHzFoYG0VRwxw9IqMO/ojx5jjKEr/Skes63Ktnp/aH1SizhTodj
+V27kkTRwA6HdLlhqvWNMipLY2O6krVhw10hbOCYbV8Qy4cWnfzhl60y+rQ8tMU7v
+S3ASQwKBgFd+MdpochiSNbu+51RCVgnOyPahJmwstVq88p4PzdBNw7qlo5lWt30W
+EejN+fUR/dIZPy4M3nxH9W7n4QWqa8UiuNC1hFEQm/tnj7hKXu8P5jPXTcIJFusf
+d26rhw3MAbnwoqtRiyXxA6Teecq7RJH4I1+6RB1Y+jUeVO9rlmyA
+-----END RSA PRIVATE KEY-----
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a185182/bigtop-deploy/puppet/modules/hadoop/files/hdfs/id_hdfsuser.pub
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hadoop/files/hdfs/id_hdfsuser.pub b/bigtop-deploy/puppet/modules/hadoop/files/hdfs/id_hdfsuser.pub
new file mode 100644
index 0000000..8e279db
--- /dev/null
+++ b/bigtop-deploy/puppet/modules/hadoop/files/hdfs/id_hdfsuser.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3p863I0zXIKCt0ohfOZniTTQXa78WLkIBGJk3wDaoPy99EdrSyPJFFG4gnNNACs2IVLpNYlpNbsLX0xwKJo0YccYAV5rGnM2NLnoHzP4R8Ib29Q/zbyL/zUQP/6Kc4ZLNFIGeK+nE6Bg3NpHBj8/GaNn/0NEPqDr/aWom7n2P6CZdCo6t3IkU8+IY9CMQEnZiuD+FJ1qrr/VhF6H4LoApaAgV2C/kIquW60wz85cZb0eG6NezQeDt7A14Jx8aE95q1yFMXRHynsSgcsasvCf4W2BMG8SWj81A36l3AvwHupc4puuY1FjzGN0isi0FrjBrpXQHckqjhgydILH5brwT hdfs dev ssh key
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6a185182/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 5703db9..64b3ee6 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',
[2/2] bigtop git commit: BIGTOP-2259. Check for smoke-test projects
should be generalized
Posted by co...@apache.org.
BIGTOP-2259. Check for smoke-test projects should be generalized
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/815908d4
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/815908d4
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/815908d4
Branch: refs/heads/master
Commit: 815908d433baf9a754c74e26ac2aafe883fe800a
Parents: 6a18518
Author: Konstantin Boudnik <co...@boudnik.org>
Authored: Mon Jan 18 23:41:42 2016 -0800
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Tue Jan 19 13:54:16 2016 -0800
----------------------------------------------------------------------
build.gradle | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/815908d4/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 5064cb5..c74b9a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -182,13 +182,14 @@ project(':itest-common') {
* This is done to avoid running cluster smoke tests during the normal life-cycle
* of the project development
*/
-def checkSmokeTestProjects = {
- FileTree fTree = fileTree(dir: 'bigtop-tests/smoke-tests', include: '*/build.gradle')
+def checkClusterTestProjects = { property ->
+ def suiteName = property.replaceAll('.', '-')
+ FileTree fTree = fileTree(dir: "bigtop-tests/$suiteName", include: '*/build.gradle')
fTree.each() { smokeProject ->
def parent = smokeProject.getParentFile().name
- project (":bigtop-tests:smoke-tests:$parent") {
+ project (":bigtop-tests:$suiteName:$parent") {
test {
- onlyIf {project.hasProperty('smoke.tests')}
+ onlyIf {project.hasProperty(suiteName)}
}
}
}
@@ -412,7 +413,7 @@ task "bigtop-slaves"(dependsOn: 'gen-gradle-home', type:Exec,
}
project.afterEvaluate {
- checkSmokeTestProjects()
+ checkClusterTestProjects("smoke.tests")
artifactToInstall(dependsOn: [installTopLevel, installCommon, installConf, installiTest])
}