Commit Graph

5 Commits

Author SHA1 Message Date
Annie Hedgpeth a9d5610a29 provider/azurerm: Add example of CDN with Storage Account (#14193)
* initial commit - 101-vm-from-user-image

* changed branch name

* not deploying - storage problems

* provisions vm but image not properly prepared

* storage not correct

* provisions properly

* changed main.tf to azuredeploy.tf

* added tfvars and info for README

* tfvars ignored and corrected file ext

* added CI config; added sane defaults for variables; updated deployment script, added mac specific deployment for local testing

* deploy.sh to be executable

* executable deploy files

* added CI files; changed vars

* prep for PR

* removal of old folder

* prep for PR

* wrong args for travis

* more PR prep

* updated README

* commented out variables in terraform.tfvars

* Topic 101 vm from user image (#2)

* initial commit - 101-vm-from-user-image
* added tfvars and info for README
* added CI config; added sane defaults for variables; updated deployment script, added mac specific deployment for local testing
* prep for PR

* added new template

* oops, left off master

* prep for PR

* correct repository for destination

* renamed scripts to be more intuitive; added check for docker

* merge vm simple; vm from image

* initial commit

* deploys locally

* updated deploy

* changed to allow http & https (like ARM tmplt)

* changed host_name & host_name variable desc

* prep for PR

* took out armviz button and minor README changes

* changed host_name

* fixed merge conflicts

* changed host_name variable

* updating Hashicorp's changes to merged simple linux branch

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

* reverted to Hashicorp's .travis.yml

* terraform graph

* removing pending example

* cleaned up deploy.ci.sh
2017-05-04 14:28:04 +01:00
Annie Hedgpeth 8e7f3cc09d provider/azurerm: Add example of a VNET w/ Two Subnets (#14115)
* merge master

* added new constructs/naming for deploy scripts, etc.

* suppress az login output

* removed .tfvars and provider.tf; updated prev merge

* reverted .travis.yml back to Hashicorp's

* Reverting back to the Hashicorp travis file
2017-05-04 10:57:54 +01:00
anniehedgpeth 0f1af30c78 removed tfvars & provider; minor changes to main & outputs per PR 2017-05-02 14:09:41 -05:00
Scott Nowicki 1e80f4ff61 redirect output of az login to /dev/null to hide SPN detail (#11) 2017-04-28 15:45:00 -05:00
Scott Nowicki 4438a06891 merge branch topic-101-vm-simple-linux 2017-04-27 19:51:24 -05:00