You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2017/03/13 20:36:32 UTC
[1/2] brooklyn-server git commit: Fix publication of EC2 host address
in DefaultConnectivityResolver
Repository: brooklyn-server
Updated Branches:
refs/heads/master f218966fe -> 82058cf7a
Fix publication of EC2 host address in DefaultConnectivityResolver
Publish Attributes.ADDRESS before guessing the EC2 hostname.
Fixes the case where host.address was set to the FQDN in EC2.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0a6c7f0a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0a6c7f0a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0a6c7f0a
Branch: refs/heads/master
Commit: 0a6c7f0ae10495a7e3aaa1b564b33c94a7203365
Parents: f218966
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Mon Mar 13 17:29:36 2017 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Mon Mar 13 17:29:36 2017 +0000
----------------------------------------------------------------------
.../location/jclouds/DefaultConnectivityResolver.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0a6c7f0a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolver.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolver.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolver.java
index b7c90eb..c4f8fe8 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolver.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolver.java
@@ -220,6 +220,10 @@ public class DefaultConnectivityResolver extends BasicConfigurableObject impleme
}
}
+ if (contextEntity != null) {
+ contextEntity.sensors().set(Attributes.ADDRESS, hapChoice.getHostText());
+ }
+
// Treat AWS as a special case because the DNS fully qualified hostname in AWS is
// (normally?!) a good way to refer to the VM from both inside and outside of the region.
if (!isNetworkModeSet() && !options.isWindows()) {
@@ -241,9 +245,6 @@ public class DefaultConnectivityResolver extends BasicConfigurableObject impleme
}
}
- if (contextEntity != null) {
- contextEntity.sensors().set(Attributes.ADDRESS, hapChoice.getHostText());
- }
ManagementAddressResolveResult result = new ManagementAddressResolveResult(hapChoice, credChoice);
LOG.debug("{} resolved management parameters for {} in {}: {}",
new Object[]{this, location, Duration.of(timer), result});
[2/2] brooklyn-server git commit: This closes #592
Posted by al...@apache.org.
This closes #592
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/82058cf7
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/82058cf7
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/82058cf7
Branch: refs/heads/master
Commit: 82058cf7a0f458e88f01aca5ff183fd2a2706a92
Parents: f218966 0a6c7f0
Author: Aled Sage <al...@gmail.com>
Authored: Mon Mar 13 20:36:16 2017 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Mar 13 20:36:16 2017 +0000
----------------------------------------------------------------------
.../location/jclouds/DefaultConnectivityResolver.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------