brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [06/11] incubator-brooklyn git commit: chef specify `--no-host-key-verify` on knife bootstrap
Date Fri, 22 May 2015 09:39:26 GMT
chef specify `--no-host-key-verify` on knife bootstrap

so that if same ip is recycled knife doesn't fail


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/60f319b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/60f319b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/60f319b5

Branch: refs/heads/master
Commit: 60f319b54b7bf16a45867fa1fd4d1a8b875f22cd
Parents: a49162f
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Wed May 20 16:57:35 2015 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Thu May 21 08:56:10 2015 +0100

----------------------------------------------------------------------
 .../main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java | 1 +
 .../main/java/brooklyn/entity/chef/KnifeConvergeTaskFactory.java   | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/60f319b5/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java
b/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java
index 46b8894..ed6722b 100644
--- a/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java
+++ b/software/base/src/main/java/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java
@@ -304,6 +304,7 @@ public class ChefLifecycleEffectorTasks extends MachineLifecycleEffectorTasks
im
             DynamicTasks.queue(
                 // if this task fails show it as failed but don't block subsequent routines
                 // (ie allow us to actually decommission the machine)
+                // TODO args could be a List<String> config key ?
                 TaskTags.markInessential(
                 new KnifeTaskFactory<String>("delete node and client registration at
chef server")
                     .add("knife node delete "+getNodeName()+" -y")

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/60f319b5/software/base/src/main/java/brooklyn/entity/chef/KnifeConvergeTaskFactory.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/chef/KnifeConvergeTaskFactory.java
b/software/base/src/main/java/brooklyn/entity/chef/KnifeConvergeTaskFactory.java
index fe05798..ba974ad 100644
--- a/software/base/src/main/java/brooklyn/entity/chef/KnifeConvergeTaskFactory.java
+++ b/software/base/src/main/java/brooklyn/entity/chef/KnifeConvergeTaskFactory.java
@@ -92,6 +92,8 @@ public class KnifeConvergeTaskFactory<RET> extends KnifeTaskFactory<RET>
{
         if (keyfile!=null) result.add("-i "+keyfile.getPath());
         else result.add("-P "+checkNotNull(machine.findPassword(), "No password or private
key data for "+machine));
         
+        result.add("--no-host-key-verify");
+        
         if (sudo != Boolean.FALSE) result.add("--sudo");
 
         if (!Strings.isNullOrEmpty(nodeName)) {


Mime
View raw message