From 0f1af30c789e1f61ebc5e0c32fd10eec456d6620 Mon Sep 17 00:00:00 2001
From: anniehedgpeth <annie.hedgpeth@gmail.com>
Date: Tue, 2 May 2017 14:09:41 -0500
Subject: [PATCH] removed tfvars & provider; minor changes to main & outputs
 per PR

---
 examples/azure-vm-simple-linux-managed-disk/README.md |  6 +-----
 examples/azure-vm-simple-linux-managed-disk/main.tf   | 11 +++++++++--
 .../azure-vm-simple-linux-managed-disk/outputs.tf     |  2 +-
 .../azure-vm-simple-linux-managed-disk/provider.tf    |  7 -------
 .../terraform.tfvars                                  |  8 --------
 5 files changed, 11 insertions(+), 23 deletions(-)
 delete mode 100644 examples/azure-vm-simple-linux-managed-disk/provider.tf
 delete mode 100644 examples/azure-vm-simple-linux-managed-disk/terraform.tfvars

diff --git a/examples/azure-vm-simple-linux-managed-disk/README.md b/examples/azure-vm-simple-linux-managed-disk/README.md
index 0492e3edc..b8d0706a1 100644
--- a/examples/azure-vm-simple-linux-managed-disk/README.md
+++ b/examples/azure-vm-simple-linux-managed-disk/README.md
@@ -1,10 +1,6 @@
 # Very simple deployment of a Linux VM
 
-<a href="http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-vm-simple-linux%2Fazuredeploy.json" target="_blank">
-    <img src="http://armviz.io/visualizebutton.png"/>
-</a>
-
-This template allows you to deploy a simple Linux VM using a few different options for the Ubuntu version, using the latest patched version. This will deploy a A1 size VM in the resource group location and return the FQDN of the VM.
+This template allows you to deploy a simple Linux VM using a few different options for the Ubuntu version, using the latest patched version. This will deploy an A0 size VM in the resource group location and return the FQDN of the VM.
 
 This template takes a minimum amount of parameters and deploys a Linux VM, using the latest patched version.
 
diff --git a/examples/azure-vm-simple-linux-managed-disk/main.tf b/examples/azure-vm-simple-linux-managed-disk/main.tf
index 17a5c23e9..ee44db013 100644
--- a/examples/azure-vm-simple-linux-managed-disk/main.tf
+++ b/examples/azure-vm-simple-linux-managed-disk/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}"
@@ -34,7 +41,7 @@ resource "azurerm_public_ip" "pip" {
   name                         = "${var.rg_prefix}-ip"
   location                     = "${var.location}"
   resource_group_name          = "${azurerm_resource_group.rg.name}"
-  public_ip_address_allocation = "dynamic"
+  public_ip_address_allocation = "Dynamic"
   domain_name_label            = "${var.dns_name}"
 }
 
@@ -95,7 +102,7 @@ resource "azurerm_virtual_machine" "vm" {
   }
 
   boot_diagnostics {
-    enabled     = "true"
+    enabled     = true
     storage_uri = "${azurerm_storage_account.stor.primary_blob_endpoint}"
   }
 }
diff --git a/examples/azure-vm-simple-linux-managed-disk/outputs.tf b/examples/azure-vm-simple-linux-managed-disk/outputs.tf
index 9e3c2f071..13768e554 100644
--- a/examples/azure-vm-simple-linux-managed-disk/outputs.tf
+++ b/examples/azure-vm-simple-linux-managed-disk/outputs.tf
@@ -6,6 +6,6 @@ output "vm_fqdn" {
   value = "${azurerm_public_ip.pip.fqdn}"
 }
 
-output "sshCommand" {
+output "ssh_command" {
   value = "ssh ${var.admin_username}@${azurerm_public_ip.pip.fqdn}"
 }
diff --git a/examples/azure-vm-simple-linux-managed-disk/provider.tf b/examples/azure-vm-simple-linux-managed-disk/provider.tf
deleted file mode 100644
index 79291f7ca..000000000
--- a/examples/azure-vm-simple-linux-managed-disk/provider.tf
+++ /dev/null
@@ -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"
-# }
-
diff --git a/examples/azure-vm-simple-linux-managed-disk/terraform.tfvars b/examples/azure-vm-simple-linux-managed-disk/terraform.tfvars
deleted file mode 100644
index bee98e4e1..000000000
--- a/examples/azure-vm-simple-linux-managed-disk/terraform.tfvars
+++ /dev/null
@@ -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"