tidy for GCE, in response to issues encountered
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/6b9fea1d Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/6b9fea1d Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/6b9fea1d Branch: refs/heads/0.8.0-incubating Commit: 6b9fea1db371648b26fd0fb8ef6bf7996843a3f8 Parents: ae51aac Author: Alex Heneveld <[email protected]> Authored: Sat Aug 29 02:50:23 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Sat Aug 29 03:52:21 2015 +0100 ---------------------------------------------------------------------- .../apache/brooklyn/location/jclouds/BrooklynImageChooser.java | 2 ++ .../org/apache/brooklyn/location/jclouds/JcloudsLocation.java | 6 ++++++ .../brooklyn/location/jclouds/JcloudsLocationConfig.java | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6b9fea1d/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java index 963fc2f..608a949 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java @@ -175,6 +175,8 @@ public class BrooklynImageChooser implements Cloneable { if (deprecated!=null) { if ("deprecated".equalsIgnoreCase(deprecated)) return -30; + if ("obsolete".equalsIgnoreCase(deprecated)) + return -40; log.warn("Unrecognised 'deprecatedState' value '"+deprecated+"' when scoring "+img+"; ignoring that metadata"); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6b9fea1d/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 6b960d3..9a812b2 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 @@ -1250,6 +1250,12 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im }}) .put(EXTRA_PUBLIC_KEY_DATA_TO_AUTH, new CustomizeTemplateOptions() { public void apply(TemplateOptions t, ConfigBag props, Object v) { + if (t instanceof GoogleComputeEngineTemplateOptions) { + // see email to jclouds list, 29 Aug 2015; + // GCE takes this to be the only login public key, + // and setting this only works if you also overrideLoginPrivateKey + LOG.warn("Ignoring "+EXTRA_PUBLIC_KEY_DATA_TO_AUTH+"; not supported in jclouds-gce implementation."); + } t.authorizePublicKey(((CharSequence)v).toString()); }}) .put(RUN_AS_ROOT, new CustomizeTemplateOptions() { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6b9fea1d/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java index 3bcc02f..0591714 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java @@ -72,7 +72,7 @@ public interface JcloudsLocationConfig extends CloudLocationConfig { public static final ConfigKey<String> LOGIN_USER_PRIVATE_KEY_FILE = ConfigKeys.newStringConfigKey("loginUser.privateKeyFile", "Custom private key for the user who logs in initially", null); public static final ConfigKey<String> EXTRA_PUBLIC_KEY_DATA_TO_AUTH = ConfigKeys.newStringConfigKey("extraSshPublicKeyData", - "Additional public key data to add to authorized_keys", null); + "Additional public key data to add to authorized_keys, on supported clouds (not GCE)", null); @SuppressWarnings("serial") public static final ConfigKey<List<String>> EXTRA_PUBLIC_KEY_URLS_TO_AUTH = ConfigKeys.newConfigKey(new TypeToken<List<String>>() {}, "extraSshPublicKeyUrls", "Additional public keys (files or URLs, in SSH2/RFC4716/id_rsa.pub format) to add to authorized_keys", null);
