diff --git a/examples/101-vm-simple-linux/deploy.sh b/examples/101-vm-simple-linux/deploy.sh deleted file mode 100644 index a900e65c7..000000000 --- a/examples/101-vm-simple-linux/deploy.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -set -o errexit -o nounset - -# generate a unique string for CI deployment -KEY=$(cat /dev/urandom | tr -cd 'a-f0-9' | head -c 16) - -terraform get - -terraform plan \ - -var 'dns_name='$KEY \ - -var 'admin_password='$KEY \ - -var 'admin_username='$KEY \ - -var 'resource_group='$KEY - -terraform apply - -var 'dns_name='$KEY \ - -var 'admin_password='$KEY \ - -var 'admin_username='$KEY \ - -var 'resource_group='$KEY - - -# TODO: determine external validation, possibly Azure CLI - -terraform destroy - -# echo "Setting git user name" -# git config user.name $GH_USER_NAME -# -# echo "Setting git user email" -# git config user.email $GH_USER_EMAIL -# -# echo "Adding git upstream remote" -# git remote add upstream "https://$GH_TOKEN@github.com/$GH_REPO.git" -# -# git checkout master - - -# -# NOW=$(TZ=America/Chicago date) -# -# git commit -m "tfstate: $NOW [ci skip]" -# -# echo "Pushing changes to upstream master" -# git push upstream master diff --git a/examples/azure-vm-simple-linux/deploy.sh b/examples/azure-vm-simple-linux/deploy.sh index 6028622c3..a900e65c7 100644 --- a/examples/azure-vm-simple-linux/deploy.sh +++ b/examples/azure-vm-simple-linux/deploy.sh @@ -2,11 +2,23 @@ set -o errexit -o nounset -HOSTNAME=$(cat /dev/urandom | tr -cd 'a-f0-9' | head -c 16) +# generate a unique string for CI deployment +KEY=$(cat /dev/urandom | tr -cd 'a-f0-9' | head -c 16) terraform get -terraform plan -var 'dns_name='$HOSTNAME -terraform apply -var 'dns_name='$HOSTNAME + +terraform plan \ + -var 'dns_name='$KEY \ + -var 'admin_password='$KEY \ + -var 'admin_username='$KEY \ + -var 'resource_group='$KEY + +terraform apply + -var 'dns_name='$KEY \ + -var 'admin_password='$KEY \ + -var 'admin_username='$KEY \ + -var 'resource_group='$KEY + # TODO: determine external validation, possibly Azure CLI