github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3783 from withinboredom/rl/fix-azure-vnet

Browse Source 
fixes azure provisioning with portal created vnets
This commit is contained in:
Brendan Burns 2015-01-26 20:18:00 -08:00
commit d78d3e69c3
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/azure/util.sh
View File

@ -363,16 +363,14 @@ function kube-up {
-subj "/CN=azure-ssh-key" -subj "/CN=azure-ssh-key"
fi fi
if [[ -z "$(azure_call network vnet show $AZ_VNET 2>/dev/null | grep data)" ]]; then if [[ -z "$(azure_call network vnet show "$AZ_VNET" 2>/dev/null | grep data)" ]]; then
#azure network vnet create with $AZ_SUBNET
#FIXME not working
echo error create vnet $AZ_VNET with subnet $AZ_SUBNET echo error create vnet $AZ_VNET with subnet $AZ_SUBNET
exit 1 exit 1
fi fi
echo "--> Starting VM" echo "--> Starting VM"
azure_call vm create \ azure_call vm create \
-w $AZ_VNET \ -w "$AZ_VNET" \
-n $MASTER_NAME \ -n $MASTER_NAME \
-l "$AZ_LOCATION" \ -l "$AZ_LOCATION" \
-t $AZ_SSH_CERT \ -t $AZ_SSH_CERT \
@ -399,7 +397,7 @@ function kube-up {
echo "--> Starting VM" echo "--> Starting VM"
azure_call vm create \ azure_call vm create \
-c -w $AZ_VNET \ -c -w "$AZ_VNET" \
-n ${MINION_NAMES[$i]} \ -n ${MINION_NAMES[$i]} \
-l "$AZ_LOCATION" \ -l "$AZ_LOCATION" \
-t $AZ_SSH_CERT \ -t $AZ_SSH_CERT \