updating files to merge w/master and prep for Hashicorp pr

.travis.yml

@@ -1,3 +1,7 @@
+####################################################################################
+## NOT FOR UPSTREAM PROPOSAL; INTENDED FOR CI OF AZURE EXAMPLES IN THIS REPO ONLY ##
+####################################################################################
+
 sudo: required
 
 services:
@@ -5,14 +9,19 @@ services:
 
 language: generic
 
+# on branches: ignore multiple commits that will queue build jobs, just run latest commit
+git:
+  depth: 1
+
 # establish environment variables
 env:
-  - TEST_DIR=examples/azure-cdn-with-storage-account
+  - TEST_DIR=examples/azure-vm-simple-linux-managed-disk
+  - TEST_DIR=examples/azure-vnet-two-subnets
 
 branches:
   only:
-#    - master
-    - /^(?i:topic)-.*$/
+  - master
+  - /^(?i:topic)-.*$/
 
 # install terraform
 before_deploy:
@@ -26,4 +35,4 @@ deploy:
     script: cd $TRAVIS_BUILD_DIR/$TEST_DIR && ./deploy.ci.sh
     on:
       repo: harijayms/terraform
-      branch: topic-201-cdn-with-storage-account
+      branch: master

examples/azure-cdn-with-storage-account/deploy.ci.sh

@@ -28,4 +28,4 @@ docker run --rm -it \
   --workdir=/data \
   --entrypoint "/bin/sh" \
   hashicorp/terraform:light \
-  -c "/bin/terraform destroy -force -var resource_group=$KEY;"
+  -c "/bin/terraform destroy -force -var resource_group=$KEY;"

examples/azure-cdn-with-storage-account/deploy.mac.sh

@@ -12,4 +12,4 @@ if docker -v; then
 
 else
   echo "Docker is used to run terraform commands, please install before run:  https://docs.docker.com/docker-for-mac/install/"
-fi
+fi

examples/azure-cdn-with-storage-account/main.tf

@@ -1,3 +1,10 @@
+# provider "azurerm" {
+#   subscription_id = "REPLACE-WITH-YOUR-SUBSCRIPTION-ID"
+#   client_id       = "REPLACE-WITH-YOUR-CLIENT-ID"
+#   client_secret   = "REPLACE-WITH-YOUR-CLIENT-SECRET"
+#   tenant_id       = "REPLACE-WITH-YOUR-TENANT-ID"
+# }
+
 resource "azurerm_resource_group" "rg" {
   name     = "${var.resource_group}"
   location = "${var.location}"

examples/azure-cdn-with-storage-account/provider.tf.example

@@ -1,7 +0,0 @@
-# provider "azurerm" {
-#   subscription_id = "REPLACE-WITH-YOUR-SUBSCRIPTION-ID"
-#   client_id       = "REPLACE-WITH-YOUR-CLIENT-ID"
-#   client_secret   = "REPLACE-WITH-YOUR-CLIENT-SECRET"
-#   tenant_id       = "REPLACE-WITH-YOUR-TENANT-ID"
-# }
-

examples/azure-cdn-with-storage-account/terraform.tfvars

@@ -1,8 +0,0 @@
-# Replace with relevant values
-
-# resource_group = "myresourcegroup"
-# rg_prefix      = "rg"
-# hostname       = "myvm"
-# dns_name       = "mydnsname"
-# location       = "southcentralus"
-# admin_password = "T3rr@f0rmP@ssword"