Repository: jclouds Updated Branches: refs/heads/keystonev3 b450837e9 -> ec9a88234
Properly default to unscoped authorization Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/ec9a8823 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/ec9a8823 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/ec9a8823 Branch: refs/heads/keystonev3 Commit: ec9a88234f92516facc165276bd036ed4aeb6eb4 Parents: b450837 Author: Ignasi Barrera <[email protected]> Authored: Thu Jan 11 16:42:52 2018 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Thu Jan 11 16:42:52 2018 +0100 ---------------------------------------------------------------------- .../openstack/keystone/auth/functions/BaseAuthenticator.java | 3 ++- .../org/jclouds/openstack/keystone/v3/KeystoneApiMetadata.java | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/ec9a8823/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/BaseAuthenticator.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/BaseAuthenticator.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/BaseAuthenticator.java index a9158fb..d49204c 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/BaseAuthenticator.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/functions/BaseAuthenticator.java @@ -29,6 +29,7 @@ import org.jclouds.domain.Credentials; import org.jclouds.logging.Logger; import org.jclouds.openstack.keystone.auth.domain.AuthInfo; import org.jclouds.openstack.keystone.auth.domain.TenantOrDomainAndCredentials; +import org.jclouds.openstack.keystone.v3.domain.Auth.Scope; import com.google.common.base.Function; import com.google.inject.Inject; @@ -53,7 +54,7 @@ public abstract class BaseAuthenticator<C> implements Function<Credentials, Auth @Inject(optional = true) @Named(SCOPE) - protected String scope; + protected String scope = Scope.UNSCOPED; @PostConstruct public void checkPropertiesAreCompatible() { http://git-wip-us.apache.org/repos/asf/jclouds/blob/ec9a8823/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/KeystoneApiMetadata.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/KeystoneApiMetadata.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/KeystoneApiMetadata.java index 81c7b29..14fe19a 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/KeystoneApiMetadata.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/KeystoneApiMetadata.java @@ -18,9 +18,7 @@ package org.jclouds.openstack.keystone.v3; import static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE; import static org.jclouds.openstack.keystone.config.KeystoneProperties.KEYSTONE_VERSION; -import static org.jclouds.openstack.keystone.config.KeystoneProperties.SCOPE; import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE; -import static org.jclouds.openstack.keystone.v3.domain.Auth.Scope.UNSCOPED; import java.net.URI; import java.util.Properties; @@ -61,7 +59,6 @@ public class KeystoneApiMetadata extends BaseHttpApiMetadata<KeystoneApi> { properties.setProperty(CREDENTIAL_TYPE, org.jclouds.openstack.keystone.auth.config.CredentialTypes.PASSWORD_CREDENTIALS); properties.setProperty(SERVICE_TYPE, ServiceType.IDENTITY); properties.setProperty(KEYSTONE_VERSION, "3"); - properties.setProperty(SCOPE, UNSCOPED); return properties; }
