oem/azure: dynamically determine storage endpoint

Apparently this differs between clouds.
This commit is contained in:
Alex Crawford 2016-06-10 16:14:12 -07:00
parent b6c6c89bbc
commit f221bcf20e
2 changed files with 16 additions and 3 deletions

View File

@ -1,4 +1,3 @@
AZURE_ENVIRONMENT=AzureCloud
REGIONS=(
"West Europe"
"North Europe"
@ -24,11 +23,25 @@ REGIONS=(
"UK South 2"
)
getAzureEnvironment() {
azure account show --json | \
jq '.[0].environmentName' --raw-output
}
getManagementEndpoint() {
azure account env show --environment=$AZURE_ENVIRONMENT --json | \
azure account env show --environment=$(getAzureEnvironment) --json | \
jq '.managementEndpointUrl' --raw-output
}
getStorageEndpointPrefix() {
azure account env show --environment=$(getAzureEnvironment) --json | \
jq '.storageEndpointSuffix' --raw-output
}
getBlobStorageEndpoint() {
echo "blob$(getStorageEndpointPrefix)"
}
getSubscriptionId() {
azure account show --json | \
jq '.[0].id' --raw-output

View File

@ -61,7 +61,7 @@ azure storage blob copy start \
echo "Creating Azure image from blob..."
azure vm image create \
--blob-url="https://coreos.blob.core.windows.net/publish/coreos-${VERSION}-${LGROUP}.vhd" \
--blob-url="https://coreos.$(getBlobStorageEndpoint)/publish/coreos-${VERSION}-${LGROUP}.vhd" \
--os="linux" \
--label="CoreOS ${UGROUP}" \
"CoreOS-${UGROUP}-${VERSION}"