You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/07/07 09:33:28 UTC
[3/3] brooklyn-server git commit: added TODO comments re
https://github.com/apache/brooklyn-server/pull/230
added TODO comments re https://github.com/apache/brooklyn-server/pull/230
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/25792653
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/25792653
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/25792653
Branch: refs/heads/master
Commit: 257926534101749280853455dd7e0684eaa56c27
Parents: f92180a
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Jul 7 10:33:09 2016 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Jul 7 10:33:09 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java | 1 +
.../org/apache/brooklyn/entity/machine/SetHostnameCustomizer.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/25792653/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 5c554a1..572a0bf 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
@@ -921,6 +921,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
} else {
customisationForLogging.add("configure hostname");
+ // also see TODO in SetHostnameCustomizer - ideally we share code between here and there
executeCommandThrowingOnError(
(SshMachineLocation)machineLocation,
"Generate hostname " + node.getName(),
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/25792653/software/base/src/main/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizer.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizer.java b/software/base/src/main/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizer.java
index 54ffa72..28f97ee 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizer.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizer.java
@@ -52,6 +52,7 @@ import com.google.common.reflect.TypeToken;
* The customizer can be configured with a hard-coded hostname, or with a freemarker template
* whose value (after substitutions) will be used for the hostname.
*/
+// TODO basic hostname setting is done by JcloudsLocation, combine that code with this
public class SetHostnameCustomizer extends BasicMachineLocationCustomizer {
public static final Logger log = LoggerFactory.getLogger(SetHostnameCustomizer.class);