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.

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

Upgrade to terraform 0.12 #3

Open
wants to merge 1 commit into
base: feature/terraform-0.12
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,35 @@
* ```
*/

provider "azurerm" {}
provider "azurerm" {
version = "~> 2.3"
features {
}
}

locals {
cluster_name = "${var.name_prefix != "" ? "${var.name_prefix}-${var.cluster_name}" : var.cluster_name}"
cluster_name = var.name_prefix != "" ? "${var.name_prefix}-${var.cluster_name}" : var.cluster_name
}

resource "azurerm_virtual_network" "vnet" {
name = "vnet-${local.cluster_name}"
address_space = ["${var.subnet_range}"]
location = "${var.location}"
resource_group_name = "${var.resource_group_name}"
address_space = [var.subnet_range]
location = var.location
resource_group_name = var.resource_group_name

tags = "${merge(var.tags, map("Name", var.cluster_name,
"Cluster", var.cluster_name))}"
tags = merge(
var.tags,
{
"Name" = var.cluster_name
"Cluster" = var.cluster_name
},
)
}

resource "azurerm_subnet" "dcos" {
name = "dcos-${local.cluster_name}"
address_prefix = "${var.subnet_range}"
virtual_network_name = "${azurerm_virtual_network.vnet.name}"
resource_group_name = "${var.resource_group_name}"
address_prefixes = [var.subnet_range]
virtual_network_name = azurerm_virtual_network.vnet.name
resource_group_name = var.resource_group_name
}

3 changes: 2 additions & 1 deletion meta.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
terraform {
required_version = "~> 0.11.13"
required_version = "~> 0.12"
}

12 changes: 6 additions & 6 deletions outputs.tf
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
output "subnet_id" {
description = "Subnet ID"
value = "${azurerm_subnet.dcos.id}"
value = azurerm_subnet.dcos.id
}

output "subnet_name" {
description = "public subnet name"
value = "${azurerm_subnet.dcos.name}"
value = azurerm_subnet.dcos.name
}

output "resource_group_name" {
description = "Name of the azure resource group"
value = "${var.resource_group_name}"
value = var.resource_group_name
}

output "vnet_id" {
description = "ID of the VNET"
value = "${azurerm_virtual_network.vnet.id}"
value = azurerm_virtual_network.vnet.id
}

output "vnet_name" {
description = "Name of the VNET"
value = "${azurerm_virtual_network.vnet.name}"
}
value = azurerm_virtual_network.vnet.name
}
3 changes: 2 additions & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ variable "resource_group_name" {

variable "tags" {
description = "Add custom tags to all resources"
type = "map"
type = map(string)
default = {}
}