Upgrade examples to work with terraform 12

DNSaaS/main.tf

@@ -1,17 +1,17 @@
 resource "openstack_dns_zone_v2" "example_zone" {
-  name = "example.com."
-  email = "email2@example.com"
+  name        = "example.com."
+  email       = "email2@example.com"
   description = "a zone"
-  ttl = 6000
-  type = "PRIMARY"
+  ttl         = 6000
+  type        = "PRIMARY"
 }
 
 resource "openstack_dns_recordset_v2" "rs_example_com" {
-  zone_id = "${openstack_dns_zone_v2.example_zone.id}"
-  name = "rs.example.com."
+  zone_id     = openstack_dns_zone_v2.example_zone.id
+  name        = "rs.example.com."
   description = "An example record set"
-  ttl = 3000
-  type = "A"
-  records = ["10.0.0.1"]
+  ttl         = 3000
+  type        = "A"
+  records     = ["10.0.0.1"]
 }
 

DNSaaS/versions.tf

@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}

FWaaS/fw.tf

@@ -18,13 +18,15 @@ resource "openstack_fw_rule_v1" "rule_2" {
 resource "openstack_fw_policy_v1" "policy_1" {
   name = "my-policy"
 
-  rules = ["${openstack_fw_rule_v1.rule_1.id}",
-    "${openstack_fw_rule_v1.rule_2.id}",
+  rules = [
+    openstack_fw_rule_v1.rule_1.id,
+    openstack_fw_rule_v1.rule_2.id,
   ]
 }
 
 resource "openstack_fw_firewall_v1" "firewall_1" {
   name               = "my-firewall"
-  policy_id          = "${openstack_fw_policy_v1.policy_1.id}"
-  associated_routers = ["${openstack_networking_router_v2.router.id}"]
+  policy_id          = openstack_fw_policy_v1.policy_1.id
+  associated_routers = [openstack_networking_router_v2.router.id]
 }
+

FWaaS/instaces.tf

@@ -9,13 +9,13 @@ data "openstack_images_image_v2" "image" {
 
 resource "openstack_compute_instance_v2" "instance_red" {
   name            = "RED Instance"
-  image_id        = "${data.openstack_images_image_v2.image.id}"
+  image_id        = data.openstack_images_image_v2.image.id
   flavor_name     = "m1.micro"
-  key_pair        = "${openstack_compute_keypair_v2.kp_adminuser.name}"
-  security_groups = ["${openstack_compute_secgroup_v2.sg_ssh.name}"]
+  key_pair        = openstack_compute_keypair_v2.kp_adminuser.name
+  security_groups = [openstack_compute_secgroup_v2.sg_ssh.name]
 
   network {
-    name = "${openstack_networking_network_v2.net_red.name}"
+    name = openstack_networking_network_v2.net_red.name
   }
 }
 
@@ -24,25 +24,23 @@ resource "openstack_compute_floatingip_v2" "fip_red" {
 }
 
 resource "openstack_compute_floatingip_associate_v2" "fipas_red" {
-  floating_ip = "${openstack_compute_floatingip_v2.fip_red.address}"
-  instance_id = "${openstack_compute_instance_v2.instance_red.id}"
+  floating_ip = openstack_compute_floatingip_v2.fip_red.address
+  instance_id = openstack_compute_instance_v2.instance_red.id
 }
 
 resource "openstack_compute_instance_v2" "instance_blue" {
   name            = "BLUE Instance"
-  image_id        = "${data.openstack_images_image_v2.image.id}"
+  image_id        = data.openstack_images_image_v2.image.id
   flavor_name     = "m1.micro"
-  key_pair        = "${openstack_compute_keypair_v2.kp_adminuser.name}"
-  security_groups = ["${openstack_compute_secgroup_v2.sg_ssh.name}"]
+  key_pair        = openstack_compute_keypair_v2.kp_adminuser.name
+  security_groups = [openstack_compute_secgroup_v2.sg_ssh.name]
 
   network {
-    name = "${openstack_networking_network_v2.net_blue.name}"
+    name = openstack_networking_network_v2.net_blue.name
   }
 
   lifecycle {
-    ignore_changes = [
-      "image_id",
-    ]
+    ignore_changes = [image_id]
   }
 }
 
@@ -51,6 +49,7 @@ resource "openstack_compute_floatingip_v2" "fip_blue" {
 }
 
 resource "openstack_compute_floatingip_associate_v2" "fipas_blue" {
-  floating_ip = "${openstack_compute_floatingip_v2.fip_blue.address}"
-  instance_id = "${openstack_compute_instance_v2.instance_blue.id}"
+  floating_ip = openstack_compute_floatingip_v2.fip_blue.address
+  instance_id = openstack_compute_instance_v2.instance_blue.id
 }
+

FWaaS/networks.tf

@@ -1,5 +1,5 @@
 data "openstack_networking_network_v2" "ext-net" {
-  name = "${var.external_network}"
+  name = var.external_network
 }
 
 resource "openstack_networking_network_v2" "net_red" {
@@ -14,15 +14,15 @@ resource "openstack_networking_network_v2" "net_blue" {
 
 resource "openstack_networking_subnet_v2" "subnet_red" {
   name            = "subnet_red"
-  network_id      = "${openstack_networking_network_v2.net_red.id}"
+  network_id      = openstack_networking_network_v2.net_red.id
   dns_nameservers = ["8.8.8.8", "8.8.4.4"]
   cidr            = "192.168.1.0/24"
   ip_version      = 4
 }
 
 resource "openstack_networking_subnet_v2" "subnet_blue" {
   name            = "subnet_blue"
-  network_id      = "${openstack_networking_network_v2.net_blue.id}"
+  network_id      = openstack_networking_network_v2.net_blue.id
   dns_nameservers = ["8.8.8.8", "8.8.4.4"]
   cidr            = "192.168.2.0/24"
   ip_version      = 4
@@ -31,15 +31,16 @@ resource "openstack_networking_subnet_v2" "subnet_blue" {
 resource "openstack_networking_router_v2" "router" {
   name                = "router"
   admin_state_up      = true
-  external_network_id = "${data.openstack_networking_network_v2.ext-net.id}"
+  external_network_id = data.openstack_networking_network_v2.ext-net.id
 }
 
 resource "openstack_networking_router_interface_v2" "routerint_red" {
-  router_id = "${openstack_networking_router_v2.router.id}"
-  subnet_id = "${openstack_networking_subnet_v2.subnet_red.id}"
+  router_id = openstack_networking_router_v2.router.id
+  subnet_id = openstack_networking_subnet_v2.subnet_red.id
 }
 
 resource "openstack_networking_router_interface_v2" "routerint_blue" {
-  router_id = "${openstack_networking_router_v2.router.id}"
-  subnet_id = "${openstack_networking_subnet_v2.subnet_blue.id}"
+  router_id = openstack_networking_router_v2.router.id
+  subnet_id = openstack_networking_subnet_v2.subnet_blue.id
 }
+

FWaaS/security-groups.tf

@@ -16,3 +16,4 @@ resource "openstack_compute_secgroup_v2" "sg_ssh" {
     cidr        = "0.0.0.0/0"
   }
 }
+

FWaaS/ssh-keys.tf

@@ -1,4 +1,5 @@
 resource "openstack_compute_keypair_v2" "kp_adminuser" {
   name       = "kp_adminuser"
-  public_key = "${var.ssh_publickey}"
+  public_key = var.ssh_publickey
 }
+

FWaaS/vars.tf

@@ -1,10 +1,11 @@
 variable "external_network" {
-  type        = "string"
+  type        = string
   description = "external network name"
   default     = "ext-net"
 }
 
 variable "ssh_publickey" {
-  type        = "string"
+  type        = string
   description = "ssh-rsa public key in authorized_keys format (ssh-rsa AAAAB3Nz [...] ABAAACAC62Lw== user@host)"
 }
+

FWaaS/versions.tf

@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}