You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2015/12/04 13:48:52 UTC
[6/7] incubator-brooklyn git commit: JcloudsLocation: use
CREATE_UNMANAGED for temporary machineLocations
JcloudsLocation: use CREATE_UNMANAGED for temporary machineLocations
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a095f3a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a095f3a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a095f3a1
Branch: refs/heads/master
Commit: a095f3a10a047db389100ce19f15114b9be177ea
Parents: c51840a
Author: Aled Sage <al...@gmail.com>
Authored: Fri Dec 4 12:08:38 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Dec 4 12:08:38 2015 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/location/jclouds/JcloudsLocation.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a095f3a1/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 3868d84..8a666c6 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
@@ -73,6 +73,7 @@ import org.apache.brooklyn.core.location.cloud.AbstractCloudMachineProvisioningL
import org.apache.brooklyn.core.location.cloud.AvailabilityZoneExtension;
import org.apache.brooklyn.core.location.cloud.names.AbstractCloudMachineNamer;
import org.apache.brooklyn.core.location.cloud.names.CloudMachineNamer;
+import org.apache.brooklyn.core.mgmt.internal.LocalLocationManager;
import org.apache.brooklyn.core.mgmt.persist.LocationWithObjectStore;
import org.apache.brooklyn.core.mgmt.persist.PersistenceObjectStore;
import org.apache.brooklyn.core.mgmt.persist.jclouds.JcloudsBlobStoreBasedObjectStore;
@@ -1591,6 +1592,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
sshProps.put("address", hostAndPort.getHostText());
sshProps.put("port", hostAndPort.getPort());
sshProps.put(AbstractLocation.TEMPORARY_LOCATION.getName(), true);
+ sshProps.put(LocalLocationManager.CREATE_UNMANAGED.getName(), true);
sshProps.remove("password");
sshProps.remove("privateKeyData");
sshProps.remove("privateKeyFile");
@@ -1620,6 +1622,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
winrmProps.put("address", hostAndPort.getHostText());
winrmProps.put("port", hostAndPort.getPort());
winrmProps.put(AbstractLocation.TEMPORARY_LOCATION.getName(), true);
+ winrmProps.put(LocalLocationManager.CREATE_UNMANAGED.getName(), true);
winrmProps.remove("password");
winrmProps.remove("privateKeyData");
winrmProps.remove("privateKeyFile");