You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by an...@apache.org on 2017/01/11 20:31:40 UTC

[1/2] brooklyn-server git commit: Allow oauth.endpoint in location

Repository: brooklyn-server
Updated Branches:
  refs/heads/master 07e5503d8 -> 03ded82d2


Allow oauth.endpoint in location


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

Branch: refs/heads/master
Commit: a704f808cfeb145c5c35d18bfbde95f9deb26526
Parents: 07e5503
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Wed Jan 11 17:03:01 2017 +0000
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Wed Jan 11 17:05:55 2017 +0000

----------------------------------------------------------------------
 .../org/apache/brooklyn/core/location/LocationConfigKeys.java    | 2 ++
 .../apache/brooklyn/core/location/cloud/CloudLocationConfig.java | 3 ++-
 .../brooklyn/location/jclouds/ComputeServiceRegistryImpl.java    | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a704f808/core/src/main/java/org/apache/brooklyn/core/location/LocationConfigKeys.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/LocationConfigKeys.java b/core/src/main/java/org/apache/brooklyn/core/location/LocationConfigKeys.java
index 715f39a..db73712 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/LocationConfigKeys.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/LocationConfigKeys.java
@@ -50,6 +50,8 @@ public class LocationConfigKeys {
     public static final ConfigKey<String> CLOUD_REGION_ID = ConfigKeys.newStringConfigKey("region");
     public static final ConfigKey<String> CLOUD_AVAILABILITY_ZONE_ID = ConfigKeys.newStringConfigKey("availabilityZone");
 
+    public static final ConfigKey<String> OAUTH_ENDPOINT = ConfigKeys.newStringConfigKey("oauth.endpoint");
+
     @SuppressWarnings("serial")
     public static final ConfigKey<Set<String>> ISO_3166 = ConfigKeys.newConfigKey(new TypeToken<Set<String>>() {}, "iso3166", "ISO-3166 or ISO-3166-2 location codes"); 
 

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a704f808/core/src/main/java/org/apache/brooklyn/core/location/cloud/CloudLocationConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/cloud/CloudLocationConfig.java b/core/src/main/java/org/apache/brooklyn/core/location/cloud/CloudLocationConfig.java
index c5f3773..bd3add8 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/cloud/CloudLocationConfig.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/cloud/CloudLocationConfig.java
@@ -39,7 +39,8 @@ public interface CloudLocationConfig {
     public static final ConfigKey<String> CLOUD_ENDPOINT = LocationConfigKeys.CLOUD_ENDPOINT;
     public static final ConfigKey<String> CLOUD_REGION_ID = LocationConfigKeys.CLOUD_REGION_ID;
     public static final ConfigKey<String> CLOUD_AVAILABILITY_ZONE_ID = LocationConfigKeys.CLOUD_AVAILABILITY_ZONE_ID;
-        
+
+    public static final ConfigKey<String> OAUTH_ENDPOINT = LocationConfigKeys.OAUTH_ENDPOINT;
 
     @SetFromFlag("extensions")
     public static final MapConfigKey<String> EXTENSION = LocationConfigKeys.EXTENSIONS;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a704f808/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistryImpl.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistryImpl.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistryImpl.java
index 69fc87e..9768dba 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistryImpl.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistryImpl.java
@@ -74,7 +74,9 @@ public class ComputeServiceRegistryImpl implements ComputeServiceRegistry, Jclou
         properties.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, Boolean.toString(true));
         properties.setProperty("jclouds.ssh.max-retries", conf.getStringKey("jclouds.ssh.max-retries") != null ? 
                 conf.getStringKey("jclouds.ssh.max-retries").toString() : "50");
-        
+
+        if (conf.get(OAUTH_ENDPOINT) != null) properties.setProperty(OAUTH_ENDPOINT.getName(),conf.get(OAUTH_ENDPOINT));
+
         // See https://issues.apache.org/jira/browse/BROOKLYN-394
         // For retries, the backoff times are:
         //   Math.min(2^failureCount * retryDelayStart, retryDelayStart * 10) + random(10%)


[2/2] brooklyn-server git commit: This closes #514

Posted by an...@apache.org.
This closes #514


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

Branch: refs/heads/master
Commit: 03ded82d26ed280e119a641a55d4fe70db4de372
Parents: 07e5503 a704f80
Author: Andrea Turli <an...@gmail.com>
Authored: Wed Jan 11 21:31:24 2017 +0100
Committer: Andrea Turli <an...@gmail.com>
Committed: Wed Jan 11 21:31:24 2017 +0100

----------------------------------------------------------------------
 .../org/apache/brooklyn/core/location/LocationConfigKeys.java    | 2 ++
 .../apache/brooklyn/core/location/cloud/CloudLocationConfig.java | 3 ++-
 .../brooklyn/location/jclouds/ComputeServiceRegistryImpl.java    | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------