diff --git a/contrib/azurerm/apply-rg.sh b/contrib/azurerm/apply-rg.sh index efa330bb5..2348169d4 100755 --- a/contrib/azurerm/apply-rg.sh +++ b/contrib/azurerm/apply-rg.sh @@ -9,18 +9,11 @@ if [ "$AZURE_RESOURCE_GROUP" == "" ]; then exit 1 fi -if az &>/dev/null; then - echo "azure cli 2.0 found, using it instead of 1.0" - ./apply-rg_2.sh "$AZURE_RESOURCE_GROUP" -elif azure &>/dev/null; then - ansible-playbook generate-templates.yml - - azure group deployment create -f ./.generated/network.json -g $AZURE_RESOURCE_GROUP - azure group deployment create -f ./.generated/storage.json -g $AZURE_RESOURCE_GROUP - azure group deployment create -f ./.generated/availability-sets.json -g $AZURE_RESOURCE_GROUP - azure group deployment create -f ./.generated/bastion.json -g $AZURE_RESOURCE_GROUP - azure group deployment create -f ./.generated/masters.json -g $AZURE_RESOURCE_GROUP - azure group deployment create -f ./.generated/minions.json -g $AZURE_RESOURCE_GROUP -else - echo "Azure cli not found" -fi +ansible-playbook generate-templates.yml + +az deployment group create --template-file ./.generated/network.json -g $AZURE_RESOURCE_GROUP +az deployment group create --template-file ./.generated/storage.json -g $AZURE_RESOURCE_GROUP +az deployment group create --template-file ./.generated/availability-sets.json -g $AZURE_RESOURCE_GROUP +az deployment group create --template-file ./.generated/bastion.json -g $AZURE_RESOURCE_GROUP +az deployment group create --template-file ./.generated/masters.json -g $AZURE_RESOURCE_GROUP +az deployment group create --template-file ./.generated/minions.json -g $AZURE_RESOURCE_GROUP diff --git a/contrib/azurerm/apply-rg_2.sh b/contrib/azurerm/apply-rg_2.sh deleted file mode 100755 index 2348169d4..000000000 --- a/contrib/azurerm/apply-rg_2.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -set -e - -AZURE_RESOURCE_GROUP="$1" - -if [ "$AZURE_RESOURCE_GROUP" == "" ]; then - echo "AZURE_RESOURCE_GROUP is missing" - exit 1 -fi - -ansible-playbook generate-templates.yml - -az deployment group create --template-file ./.generated/network.json -g $AZURE_RESOURCE_GROUP -az deployment group create --template-file ./.generated/storage.json -g $AZURE_RESOURCE_GROUP -az deployment group create --template-file ./.generated/availability-sets.json -g $AZURE_RESOURCE_GROUP -az deployment group create --template-file ./.generated/bastion.json -g $AZURE_RESOURCE_GROUP -az deployment group create --template-file ./.generated/masters.json -g $AZURE_RESOURCE_GROUP -az deployment group create --template-file ./.generated/minions.json -g $AZURE_RESOURCE_GROUP diff --git a/contrib/azurerm/clear-rg.sh b/contrib/azurerm/clear-rg.sh index 64fea1f16..a20045537 100755 --- a/contrib/azurerm/clear-rg.sh +++ b/contrib/azurerm/clear-rg.sh @@ -9,10 +9,6 @@ if [ "$AZURE_RESOURCE_GROUP" == "" ]; then exit 1 fi -if az &>/dev/null; then - echo "azure cli 2.0 found, using it instead of 1.0" - ./clear-rg_2.sh "$AZURE_RESOURCE_GROUP" -else - ansible-playbook generate-templates.yml - azure group deployment create -g "$AZURE_RESOURCE_GROUP" -f ./.generated/clear-rg.json -m Complete -fi +ansible-playbook generate-templates.yml + +az group deployment create -g "$AZURE_RESOURCE_GROUP" --template-file ./.generated/clear-rg.json --mode Complete diff --git a/contrib/azurerm/clear-rg_2.sh b/contrib/azurerm/clear-rg_2.sh deleted file mode 100755 index a20045537..000000000 --- a/contrib/azurerm/clear-rg_2.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -e - -AZURE_RESOURCE_GROUP="$1" - -if [ "$AZURE_RESOURCE_GROUP" == "" ]; then - echo "AZURE_RESOURCE_GROUP is missing" - exit 1 -fi - -ansible-playbook generate-templates.yml - -az group deployment create -g "$AZURE_RESOURCE_GROUP" --template-file ./.generated/clear-rg.json --mode Complete