From 1a6ef2a37ca2c1b9b126734ee84e6350831e8033 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Mon, 18 Jun 2012 08:39:59 -0700 Subject: [PATCH] updated correct identityName in openstack providers --- .../java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java | 2 +- .../jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java index c1e11535a7..75eae94c1c 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java @@ -93,7 +93,7 @@ public class NovaApiMetadata extends BaseRestApiMetadata { super(NovaClient.class, NovaAsyncClient.class); id("openstack-nova") .name("OpenStack Nova Diablo+ API") - .identityName("tenantName:accessKey") + .identityName("tenantIdOrName:user") .credentialName("password") .documentation(URI.create("http://api.openstack.org/")) .version("1.1") diff --git a/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java index d5a6c69794..02d1025ec4 100644 --- a/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java +++ b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java @@ -83,7 +83,7 @@ public class HPCloudComputeProviderMetadata extends BaseProviderMetadata { id("hpcloud-compute") .name("HP Cloud Compute Services") .apiMetadata(new NovaApiMetadata().toBuilder() - .identityName("tenantName:accessKey") + .identityName("tenantIdOrName:accessKey") .credentialName("secretKey") .defaultModules(ImmutableSet.>of(KeystoneAuthenticationModuleForZones.class,NovaRestClientModule.class, HPCloudComputeServiceContextModule.class)) .build())