Skip to content

Commit

Permalink
updating Hashicorp's changes to merged simple linux branch
Browse files Browse the repository at this point in the history
  • Loading branch information
anniehedgpeth committed May 3, 2017
1 parent d7e2acb commit dbaf8d1
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 26 deletions.
8 changes: 2 additions & 6 deletions examples/azure-vm-simple-linux-managed-disk/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# Very simple deployment of a Linux VM

<a href="http://armviz.io/#/?load=https%3A%2F%2Fraw.luolix.top%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.

Expand All @@ -21,4 +17,4 @@ Azure requires that an application is added to Azure Active Directory to generat
If a `terraform.tfvars` file is present in the current directory, Terraform automatically loads it to populate variables. We don't recommend saving usernames and password to version control, but you can create a local secret variables file and use `-var-file` to load it.

## variables.tf
The `variables.tf` file contains all of the input parameters that the user can specify when deploying this Terraform template.
The `variables.tf` file contains all of the input parameters that the user can specify when deploying this Terraform template.
2 changes: 1 addition & 1 deletion examples/azure-vm-simple-linux-managed-disk/deploy.mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 9 additions & 2 deletions examples/azure-vm-simple-linux-managed-disk/main.tf
Original file line number Diff line number Diff line change
@@ -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}"
Expand Down Expand Up @@ -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}"
}

Expand Down Expand Up @@ -95,7 +102,7 @@ resource "azurerm_virtual_machine" "vm" {
}

boot_diagnostics {
enabled = "true"
enabled = true
storage_uri = "${azurerm_storage_account.stor.primary_blob_endpoint}"
}
}
4 changes: 2 additions & 2 deletions examples/azure-vm-simple-linux-managed-disk/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
}
7 changes: 0 additions & 7 deletions examples/azure-vm-simple-linux-managed-disk/provider.tf

This file was deleted.

8 changes: 0 additions & 8 deletions examples/azure-vm-simple-linux-managed-disk/terraform.tfvars

This file was deleted.

0 comments on commit dbaf8d1

Please sign in to comment.