Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

provider/azurerm: Add example of encrypting a running linux #14642

Merged
merged 85 commits into from
May 19, 2017
Merged

provider/azurerm: Add example of encrypting a running linux #14642

merged 85 commits into from
May 19, 2017

Commits on Apr 18, 2017

  1. initial commit - 101-vm-from-user-image

    @anniehedgpeth
    anniehedgpeth committed Apr 18, 2017
    Configuration menu
    Copy the full SHA
    9f0d990 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2017

  1. changed branch name

    @anniehedgpeth
    anniehedgpeth committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    6f577a8 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2017

  1. not deploying - storage problems

    @anniehedgpeth
    anniehedgpeth committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    611d70a View commit details
    Browse the repository at this point in the history

  2. provisions vm but image not properly prepared

    @anniehedgpeth
    anniehedgpeth committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    fdff23a View commit details
    Browse the repository at this point in the history

  3. storage not correct

    @anniehedgpeth
    anniehedgpeth committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    0dac5ec View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2017

  1. provisions properly

    @anniehedgpeth
    anniehedgpeth committed Apr 22, 2017
    Configuration menu
    Copy the full SHA
    81e2559 View commit details
    Browse the repository at this point in the history

  2. changed main.tf to azuredeploy.tf

    @anniehedgpeth
    anniehedgpeth committed Apr 22, 2017
    Configuration menu
    Copy the full SHA
    7dc8150 View commit details
    Browse the repository at this point in the history

  3. added tfvars and info for README

    @anniehedgpeth
    anniehedgpeth committed Apr 22, 2017
    Configuration menu
    Copy the full SHA
    5c079fa View commit details
    Browse the repository at this point in the history

  4. tfvars ignored and corrected file ext

    @anniehedgpeth
    anniehedgpeth committed Apr 22, 2017
    Configuration menu
    Copy the full SHA
    c86ef6f View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2017

  1. added CI config; added sane defaults for variables; updated deploymen… 

    …t script, added mac specific deployment for local testing
    Scott Nowicki committed Apr 24, 2017
    Configuration menu
    Copy the full SHA
    534b236 View commit details
    Browse the repository at this point in the history

  2. deploy.sh to be executable

    Scott Nowicki committed Apr 24, 2017
    Configuration menu
    Copy the full SHA
    0cf888b View commit details
    Browse the repository at this point in the history

  3. executable deploy files

    Scott Nowicki committed Apr 24, 2017
    Configuration menu
    Copy the full SHA
    68f0003 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2017

  1. added CI files; changed vars

    @anniehedgpeth
    anniehedgpeth committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    c898510 View commit details
    Browse the repository at this point in the history

  2. merge upstream/master

    Scott Nowicki committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    9d1541c View commit details
    Browse the repository at this point in the history

  3. prep for PR

    Scott Nowicki committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    5c8ecd8 View commit details
    Browse the repository at this point in the history

  4. removal of old folder

    Scott Nowicki committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    0267fca View commit details
    Browse the repository at this point in the history

  5. prep for PR

    Scott Nowicki committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    f9bf6ba View commit details
    Browse the repository at this point in the history

  6. wrong args for travis

    Scott Nowicki committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    cec0679 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2017

  1. more PR prep

    Scott Nowicki committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    d78e8bd View commit details
    Browse the repository at this point in the history

  2. updated README

    @anniehedgpeth
    anniehedgpeth committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    6bf2df2 View commit details
    Browse the repository at this point in the history

  3. commented out variables in terraform.tfvars

    Scott Nowicki committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    b22cff0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'topic-101-vm-from-user-image' of https://github.com/10t… 

    …hmagnitude/terraform into topic-101-vm-from-user-image
    @anniehedgpeth
    anniehedgpeth committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    09175de View commit details
    Browse the repository at this point in the history

  5. 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
    @scottzilla
    scottzilla authored Apr 26, 2017
    Configuration menu
    Copy the full SHA
    0843f45 View commit details
    Browse the repository at this point in the history

  6. added new template

    Scott Nowicki committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    49caea5 View commit details
    Browse the repository at this point in the history

  7. oops, left off master

    Scott Nowicki committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    2236828 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of github.com:harijayms/terraform

    Scott Nowicki committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    27167b5 View commit details
    Browse the repository at this point in the history

  9. merge upstream; prep for PR

    Scott Nowicki committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    5b8f7bb View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2017

  1. prep for PR

    Scott Nowicki committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    7f8fe25 View commit details
    Browse the repository at this point in the history

  2. correct repository for destination

    Scott Nowicki committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    eecb2d2 View commit details
    Browse the repository at this point in the history

  3. renamed scripts to be more intuitive; added check for docker

    Scott Nowicki committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    92e341d View commit details
    Browse the repository at this point in the history

  4. merge vm simple; vm from image

    Scott Nowicki committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    23627c8 View commit details
    Browse the repository at this point in the history

  5. merge upstream

    Scott Nowicki committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    0fdf4cb View commit details
    Browse the repository at this point in the history

  6. initial commit

    @anniehedgpeth
    anniehedgpeth committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    ac2e5c2 View commit details
    Browse the repository at this point in the history

  7. deploys locally

    @anniehedgpeth
    anniehedgpeth committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    935c19a View commit details
    Browse the repository at this point in the history

  8. updated deploy

    @anniehedgpeth
    anniehedgpeth committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    66b7441 View commit details
    Browse the repository at this point in the history

  9. consolidated deploy and after_deploy into a single script; simplified… 

    … ci process; added os_profile_linux_config
    Scott Nowicki committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    c98b1d1 View commit details
    Browse the repository at this point in the history

  10. added terraform show

    Scott Nowicki committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    0ef07bc View commit details
    Browse the repository at this point in the history

  11. changed to allow http & https (like ARM tmplt)

    @anniehedgpeth
    anniehedgpeth committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    50e8d8a View commit details
    Browse the repository at this point in the history

  12. changed host_name & host_name variable desc

    @anniehedgpeth
    anniehedgpeth committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    ace9b0b View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2017

  1. added az cli check

    Scott Nowicki committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    5e99f81 View commit details
    Browse the repository at this point in the history

  2. merge upstream master

    Scott Nowicki committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    ce1f573 View commit details
    Browse the repository at this point in the history

  3. on this branch, only build test_dir; master will aggregate all the ex… 

    …amples
    Scott Nowicki committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    65826c1 View commit details
    Browse the repository at this point in the history

  4. merge master

    Scott Nowicki committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    2675c55 View commit details
    Browse the repository at this point in the history

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

    Scott Nowicki committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    072a51a View commit details
    Browse the repository at this point in the history

  6. suppress az login output

    Scott Nowicki committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    06f1a7f View commit details
    Browse the repository at this point in the history

  7. suppress az login output

    Scott Nowicki committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    3523ed3 View commit details
    Browse the repository at this point in the history

  8. forgot about line breaks

    Scott Nowicki committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    21837a9 View commit details
    Browse the repository at this point in the history

  9. breaking build as an example

    Scott Nowicki committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    e1e3aa2 View commit details
    Browse the repository at this point in the history

  10. fixing broken build example

    Scott Nowicki committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    a0a7643 View commit details
    Browse the repository at this point in the history

  11. added cdn branch; ci uses running vm to test

    @anniehedgpeth
    anniehedgpeth committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    fd0231b View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'origin' into topic-101-vnet-two-subnets

    Scott Nowicki committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    02bfac9 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2017

  1. Merge branch 'topic-101-vnet-two-subnets'

    @anniehedgpeth
    anniehedgpeth committed May 1, 2017
    Configuration menu
    Copy the full SHA
    74c4f6c View commit details
    Browse the repository at this point in the history

  2. merge of CI config

    @anniehedgpeth
    anniehedgpeth committed May 1, 2017
    Configuration menu
    Copy the full SHA
    2c02115 View commit details
    Browse the repository at this point in the history

  3. fixed grammar in readme

    Scott Nowicki committed May 1, 2017
    Configuration menu
    Copy the full SHA
    487d9cd View commit details
    Browse the repository at this point in the history

  4. prep for PR

    Scott Nowicki committed May 1, 2017
    Configuration menu
    Copy the full SHA
    d8ef7b1 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2017

  1. took out armviz button and minor README changes

    @anniehedgpeth
    anniehedgpeth committed May 2, 2017
    Configuration menu
    Copy the full SHA
    25ef50c View commit details
    Browse the repository at this point in the history

  2. changed host_name

    @anniehedgpeth
    anniehedgpeth committed May 2, 2017
    Configuration menu
    Copy the full SHA
    63c494d View commit details
    Browse the repository at this point in the history

  3. fixed merge conflicts

    @anniehedgpeth
    anniehedgpeth committed May 2, 2017
    Configuration menu
    Copy the full SHA
    9a5a15a View commit details
    Browse the repository at this point in the history

  4. Sync with upstream

    @StephenWeatherford
    StephenWeatherford committed May 2, 2017
    Configuration menu
    Copy the full SHA
    d821717 View commit details
    Browse the repository at this point in the history

  5. changed host_name variable

    @anniehedgpeth
    anniehedgpeth committed May 2, 2017
    Configuration menu
    Copy the full SHA
    d7e2acb View commit details
    Browse the repository at this point in the history

Commits on May 3, 2017

  1. updating Hashicorp's changes to merged simple linux branch

    @anniehedgpeth
    anniehedgpeth committed May 3, 2017
    Configuration menu
    Copy the full SHA
    dbaf8d1 View commit details
    Browse the repository at this point in the history

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

    @anniehedgpeth
    anniehedgpeth committed May 3, 2017
    Configuration menu
    Copy the full SHA
    b850cd5 View commit details
    Browse the repository at this point in the history

  3. Revert "updating files to merge w/master and prep for Hashicorp pr" 

    This reverts commit b850cd5.
    @anniehedgpeth
    anniehedgpeth committed May 3, 2017
    Configuration menu
    Copy the full SHA
    a6151bc View commit details
    Browse the repository at this point in the history

  4. Revert "updating Hashicorp's changes to merged simple linux branch" 

    This reverts commit dbaf8d1.
    @anniehedgpeth
    anniehedgpeth committed May 3, 2017
    Configuration menu
    Copy the full SHA
    5426739 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into topic-201-cdn-with-storage-account

    @anniehedgpeth
    anniehedgpeth committed May 3, 2017
    Configuration menu
    Copy the full SHA
    9b809ac View commit details
    Browse the repository at this point in the history

Commits on May 4, 2017

  1. removing vm from user image example from this branch

    @anniehedgpeth
    anniehedgpeth committed May 4, 2017
    Configuration menu
    Copy the full SHA
    5174369 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into topic-101-vm-from-user-image

    @anniehedgpeth
    anniehedgpeth authored May 4, 2017
    Configuration menu
    Copy the full SHA
    007ea39 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #10 from 10thmagnitude/topic-101-vm-from-user-image 

    azure-vm-from-user-image
    @anniehedgpeth
    anniehedgpeth authored May 4, 2017
    Configuration menu
    Copy the full SHA
    f6c13d4 View commit details
    Browse the repository at this point in the history

  4. removed old branch

    @anniehedgpeth
    anniehedgpeth authored May 4, 2017
    Configuration menu
    Copy the full SHA
    1366980 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2017

  1. azure-2-vms-loadbalancer-lbrules (#13) 

    * initial commit

* need to change lb_rule & nic

* deploys locally

* updated README

* updated travis and deploy scripts for Hari's repo

* renamed deploy script

* clean up

* prep for PR

* updated readme

* fixing conflict in .travis.yml
    @scottzilla @anniehedgpeth
    scottzilla authored and anniehedgpeth committed May 5, 2017
    Configuration menu
    Copy the full SHA
    6a1813e View commit details
    Browse the repository at this point in the history

Commits on May 8, 2017

  1. initial commit; in progress

    @anniehedgpeth
    anniehedgpeth committed May 8, 2017
    Configuration menu
    Copy the full SHA
    1d36407 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2017

  1. in progress

    @anniehedgpeth
    anniehedgpeth committed May 15, 2017
    Configuration menu
    Copy the full SHA
    150fab3 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2017

  1. in progress; encryption fails

    @anniehedgpeth
    anniehedgpeth committed May 16, 2017
    Configuration menu
    Copy the full SHA
    4c1d464 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2017

  1. in progress

    @anniehedgpeth
    anniehedgpeth committed May 17, 2017
    Configuration menu
    Copy the full SHA
    5b28d6f View commit details
    Browse the repository at this point in the history

Commits on May 18, 2017

  1. deploys successfully locally

    @anniehedgpeth
    anniehedgpeth committed May 18, 2017
    Configuration menu
    Copy the full SHA
    9119b76 View commit details
    Browse the repository at this point in the history

  2. clean up; deploy typo fixed

    @anniehedgpeth
    anniehedgpeth committed May 18, 2017
    Configuration menu
    Copy the full SHA
    35c8d1c View commit details
    Browse the repository at this point in the history

  3. merging hashi master into this branch

    @anniehedgpeth
    anniehedgpeth committed May 18, 2017
    Configuration menu
    Copy the full SHA
    e8b579a View commit details
    Browse the repository at this point in the history

  4. merging hashi master into this branch

    @anniehedgpeth
    anniehedgpeth committed May 18, 2017
    Configuration menu
    Copy the full SHA
    b789fb8 View commit details
    Browse the repository at this point in the history

  5. troubleshooting deploy

    @anniehedgpeth
    anniehedgpeth committed May 18, 2017
    Configuration menu
    Copy the full SHA
    7d17c74 View commit details
    Browse the repository at this point in the history

  6. added missing vars to deploy script

    @anniehedgpeth
    anniehedgpeth committed May 18, 2017
    Configuration menu
    Copy the full SHA
    35138c4 View commit details
    Browse the repository at this point in the history

  7. updated README, outputs, and added graph

    @anniehedgpeth
    anniehedgpeth committed May 18, 2017
    Configuration menu
    Copy the full SHA
    a8b9033 View commit details
    Browse the repository at this point in the history

  8. simplified outputs

    @anniehedgpeth
    anniehedgpeth committed May 18, 2017
    Configuration menu
    Copy the full SHA
    58f7215 View commit details
    Browse the repository at this point in the history

  9. reverting to Hashicorp's .travis.yml

    @anniehedgpeth
    anniehedgpeth committed May 18, 2017
    Configuration menu
    Copy the full SHA
    1ec5e62 View commit details
    Browse the repository at this point in the history

  10. clean up

    @anniehedgpeth
    anniehedgpeth committed May 18, 2017
    Configuration menu
    Copy the full SHA
    fea5267 View commit details
    Browse the repository at this point in the history

  11. readme graph correction

    @anniehedgpeth
    anniehedgpeth committed May 18, 2017
    Configuration menu
    Copy the full SHA
    5feb623 View commit details
    Browse the repository at this point in the history