Updated Branches: refs/heads/1.6.x 99a01fac1 -> 2a041bdf2
Support HKG region for Rackspace providers. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/2a041bdf Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/2a041bdf Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/2a041bdf Branch: refs/heads/1.6.x Commit: 2a041bdf2a9c7e6afca621fe0ea3764b00ac8bdd Parents: 99a01fa Author: Everett Toews <[email protected]> Authored: Thu Oct 10 14:54:32 2013 -0500 Committer: Everett Toews <[email protected]> Committed: Thu Oct 10 21:08:53 2013 -0500 ---------------------------------------------------------------------- .../cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java | 3 ++- .../us/CloudLoadBalancersUSProviderMetadata.java | 3 ++- .../rackspace/cloudservers/us/CloudServersUSProviderMetadata.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2a041bdf/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java b/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java index 070e5b8..d622783 100644 --- a/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java +++ b/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java @@ -64,11 +64,12 @@ public class CloudBlockStorageUSProviderMetadata extends BaseProviderMetadata { public static Properties defaultProperties() { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); - properties.setProperty(PROPERTY_ZONES, "ORD,DFW,IAD,SYD"); + properties.setProperty(PROPERTY_ZONES, "ORD,DFW,IAD,SYD,HKG"); properties.setProperty(PROPERTY_ZONE + ".ORD." + ISO3166_CODES, "US-IL"); properties.setProperty(PROPERTY_ZONE + ".DFW." + ISO3166_CODES, "US-TX"); properties.setProperty(PROPERTY_ZONE + ".IAD." + ISO3166_CODES, "US-VA"); properties.setProperty(PROPERTY_ZONE + ".SYD." + ISO3166_CODES, "AU-NSW"); + properties.setProperty(PROPERTY_ZONE + ".HKG." + ISO3166_CODES, "HK"); return properties; } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2a041bdf/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java b/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java index 3d9d40d..f86da42 100644 --- a/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java +++ b/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java @@ -53,11 +53,12 @@ public class CloudLoadBalancersUSProviderMetadata extends BaseProviderMetadata { public static Properties defaultProperties() { Properties properties = new Properties(); - properties.setProperty(PROPERTY_ZONES, "ORD,DFW,IAD,SYD"); + properties.setProperty(PROPERTY_ZONES, "ORD,DFW,IAD,SYD,HKG"); properties.setProperty(PROPERTY_ZONE + ".ORD." + ISO3166_CODES, "US-IL"); properties.setProperty(PROPERTY_ZONE + ".DFW." + ISO3166_CODES, "US-TX"); properties.setProperty(PROPERTY_ZONE + ".IAD." + ISO3166_CODES, "US-VA"); properties.setProperty(PROPERTY_ZONE + ".SYD." + ISO3166_CODES, "AU-NSW"); + properties.setProperty(PROPERTY_ZONE + ".HKG." + ISO3166_CODES, "HK"); return properties; } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2a041bdf/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java index c008847..5a29edb 100644 --- a/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java +++ b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java @@ -65,11 +65,12 @@ public class CloudServersUSProviderMetadata extends BaseProviderMetadata { public static Properties defaultProperties() { Properties properties = new Properties(); properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS); - properties.setProperty(PROPERTY_ZONES, "ORD,DFW,IAD,SYD"); + properties.setProperty(PROPERTY_ZONES, "ORD,DFW,IAD,SYD,HKG"); properties.setProperty(PROPERTY_ZONE + ".ORD." + ISO3166_CODES, "US-IL"); properties.setProperty(PROPERTY_ZONE + ".DFW." + ISO3166_CODES, "US-TX"); properties.setProperty(PROPERTY_ZONE + ".IAD." + ISO3166_CODES, "US-VA"); properties.setProperty(PROPERTY_ZONE + ".SYD." + ISO3166_CODES, "AU-NSW"); + properties.setProperty(PROPERTY_ZONE + ".HKG." + ISO3166_CODES, "HK"); return properties; }
