Skip to content
Permalink
Browse files
Subscription ID wasn't being substituted, add default oauth.endpoint
  • Loading branch information
jims authored and nacx committed Aug 1, 2017
1 parent 3641cdb commit caf91f88e5bd1f68225a60d6101acf95bc4a513b
Showing 1 changed file with 3 additions and 1 deletion.
@@ -89,6 +89,8 @@ public static Properties defaultProperties() {
properties.put(PROPERTY_MAX_RATE_LIMIT_WAIT, 330000);
properties.put(RESOURCE, "https://management.azure.com/");
properties.put(CREDENTIAL_TYPE, CLIENT_CREDENTIALS_SECRET.toString());
// Set a default Oauth endpoint for Azure, fill in the tenantId based on the value supplied
properties.put("oauth.endpoint", "https://login.microsoft.com/${azurecompute-arm.tenantId}/oauth2/token");
properties.put(DEFAULT_VNET_ADDRESS_SPACE_PREFIX, "10.0.0.0/16");
properties.put(DEFAULT_SUBNET_ADDRESS_PREFIX, "10.0.0.0/24");
properties.put(RESOURCENAME_PREFIX, "jclouds");
@@ -135,7 +137,7 @@ protected Builder() {
id("azurecompute-arm")
.name("Azure Resource Management")
.apiMetadata(new AzureManagementApiMetadata())
.endpoint("https://management.azure.com/subscriptions/SUBSCRIPTION_ID")
.endpoint("https://management.azure.com/subscriptions/${azurecompute-arm.subscriptionId}")
.homepage(URI.create("https://www.windowsazure.com/"))
.console(URI.create("https://windows.azure.com/default.aspx"))
.linkedServices("azureblob")

0 comments on commit caf91f8

Please sign in to comment.