brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From drigod...@apache.org
Subject [5/6] brooklyn-server git commit: JcloudsLocation: use merged config for WAIT_WINDOWS_TO_START
Date Wed, 31 May 2017 15:12:03 GMT
JcloudsLocation: use merged config for WAIT_WINDOWS_TO_START

Use `setup` (which combines location’s config and args passed to
obtain(), such as from entity’s `provisioning.properties`).

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3f06cad1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3f06cad1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3f06cad1

Branch: refs/heads/master
Commit: 3f06cad153c767b1fbfe2149e25d7f2d04405512
Parents: b987fb1
Author: Aled Sage <aled.sage@gmail.com>
Authored: Tue May 30 11:14:18 2017 +0100
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Tue May 30 16:32:48 2017 +0100

----------------------------------------------------------------------
 .../java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f06cad1/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
index 7bce8f7..8652c50 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
@@ -2456,7 +2456,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation
im
                     if (success) {
                         credsSuccessful.set(machinesToTry.getRight());
 
-                        String verifyWindowsUp = getConfig(WinRmMachineLocation.WAIT_WINDOWS_TO_START);
+                        String verifyWindowsUp = setup.get(WinRmMachineLocation.WAIT_WINDOWS_TO_START);
                         if (Strings.isBlank(verifyWindowsUp) || verifyWindowsUp.equals("false"))
{
                             return true;
                         }


Mime
View raw message