From 2557dc4c53c278b0eba6d0a396e273cec95ccb6f Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date: Fri, 11 Oct 2019 15:02:49 +0200
Subject: [PATCH] Port to terraform 0.12
---
azure/terraform/init.tf | 2 +-
azure/terraform/vault.tf | 37 +++++++++++++++++++------------------
azure/terraform/versions.tf | 3 +++
3 files changed, 23 insertions(+), 19 deletions(-)
create mode 100644 azure/terraform/versions.tf
diff --git a/azure/terraform/init.tf b/azure/terraform/init.tf
index ec215b2..e43c978 100644
--- a/azure/terraform/init.tf
+++ b/azure/terraform/init.tf
@@ -6,7 +6,7 @@
# Configure the Microsoft Azure Provider
# Empty if using the `az login` tool
provider "azurerm" {
- version = "~> 1.27"
+ version = "~> 1.27"
}
# Reuse the network security group as defined currently
diff --git a/azure/terraform/vault.tf b/azure/terraform/vault.tf
index 372452f..71a3656 100644
--- a/azure/terraform/vault.tf
+++ b/azure/terraform/vault.tf
@@ -5,20 +5,20 @@ resource "azurerm_resource_group" "euwest-vault" {
name = "euwest-vault"
location = "westeurope"
- tags {
- environment = "SWH Vault"
+ tags = {
+ environment = "SWH Vault"
}
}
resource "azurerm_network_interface" "vangogh-interface" {
- name = "vangogh-interface"
- location = "westeurope"
- resource_group_name = "euwest-vault"
- network_security_group_id = "${data.azurerm_network_security_group.worker-nsg.id}"
+ name = "vangogh-interface"
+ location = "westeurope"
+ resource_group_name = "euwest-vault"
+ network_security_group_id = data.azurerm_network_security_group.worker-nsg.id
ip_configuration {
name = "vaultNicConfiguration"
- subnet_id = "${data.azurerm_subnet.default.id}"
+ subnet_id = data.azurerm_subnet.default.id
public_ip_address_id = ""
private_ip_address_allocation = "Dynamic"
}
@@ -27,22 +27,22 @@ resource "azurerm_network_interface" "vangogh-interface" {
# Blobstorage as defined in task
resource "azurerm_storage_account" "vault-storage" {
name = "swhvaultstorage"
- resource_group_name = "${azurerm_resource_group.euwest-vault.name}"
+ resource_group_name = azurerm_resource_group.euwest-vault.name
location = "westeurope"
account_tier = "Standard"
account_replication_type = "LRS"
account_kind = "BlobStorage"
access_tier = "Cool"
- tags {
- environment = "SWH Vault"
+ tags = {
+ environment = "SWH Vault"
}
}
# A container for the blob storage named 'contents' (as other blob storages)
resource "azurerm_storage_container" "contents" {
name = "contents"
- resource_group_name = "${azurerm_resource_group.euwest-vault.name}"
- storage_account_name = "${azurerm_storage_account.vault-storage.name}"
+ resource_group_name = azurerm_resource_group.euwest-vault.name
+ storage_account_name = azurerm_storage_account.vault-storage.name
container_access_type = "private"
}
@@ -50,7 +50,7 @@ resource "azurerm_virtual_machine" "vault-server" {
name = "vangogh"
location = "westeurope"
resource_group_name = "euwest-vault"
- network_interface_ids = ["${azurerm_network_interface.vangogh-interface.id}"]
+ network_interface_ids = [azurerm_network_interface.vangogh-interface.id]
vm_size = "Standard_B2ms"
storage_os_disk {
@@ -70,18 +70,19 @@ resource "azurerm_virtual_machine" "vault-server" {
# (Va)ngogh <-> (Va)ult
os_profile {
computer_name = "vangogh"
- admin_username = "${var.user_admin}"
+ admin_username = "ardumont"
}
os_profile_linux_config {
disable_password_authentication = true
ssh_keys {
- path = "/home/${var.user_admin}/.ssh/authorized_keys"
- key_data = "${var.ssh_key_data}"
+ path = "/home/${var.user_admin}/.ssh/authorized_keys"
+ key_data = var.ssh_key_data
}
}
- tags {
- environment = "SWH Vault"
+ tags = {
+ environment = "SWH Vault"
}
}
+
diff --git a/azure/terraform/versions.tf b/azure/terraform/versions.tf
new file mode 100644
index 0000000..d9b6f79
--- /dev/null
+++ b/azure/terraform/versions.tf
@@ -0,0 +1,3 @@
+terraform {
+ required_version = ">= 0.12"
+}
--
GitLab