Merge pull request dmacvicar#610 from tripledes/terraform_012

doc: more updates for 0.12 syntx

Author: MalloZup

website/docs/r/cloudinit.html.markdown

@@ -15,12 +15,12 @@ used to customize a domain during first boot.
 
 ```hcl
 resource "libvirt_cloudinit_disk" "commoninit" {
-  name = "commoninit.iso"
-  user_data          = "${data.template_file.user_data.rendered}"
+  name      = "commoninit.iso"
+  user_data = data.template_file.user_data.rendered
 }
 
 data "template_file" "user_data" {
-  template = "${file("${path.module}/cloud_init.cfg")}"
+  template = file("${path.module}/cloud_init.cfg")
 }
 
 ```
@@ -36,7 +36,7 @@ chpasswd:
 ```
 
 In this example we change with help of cloud-init the root pwd.
-Take also insipiration from ubuntu.tf https://github.com/dmacvicar/terraform-provider-libvirt/blob/master/examples/ubuntu/ubuntu-example.tf
+Take also insipiration from ubuntu.tf https://github.com/dmacvicar/terraform-provider-libvirt/blob/master/examples/v0.12/ubuntu/ubuntu-example.tf
 
 ## Argument Reference
 

website/docs/r/coreos_ignition.html.markdown

@@ -56,17 +56,17 @@ data "ignition_systemd_unit" "example" {
 # Ignition config include the previous defined systemd unit data source
 data "ignition_config" "example" {
   systemd = [
-      "${data.ignition_systemd_unit.example.id}",
+      "data.ignition_systemd_unit.example.id",
   ]
 }
 
 resource "libvirt_ignition" "ignition" {
   name = "ignition"
-  content = "${data.ignition_config.example.rendered}"
+  content = data.ignition_config.example.rendered
 }
 
 resource "libvirt_domain" "my_machine" {
-  coreos_ignition = "${libvirt_ignition.ignition.id}"
+  coreos_ignition = libvirt_ignition.ignition.id
   ...
 }
 ```

website/docs/r/domain.html.markdown

@@ -71,17 +71,17 @@ Given that you can define a volume from a remote http file, this means, you can
 ```hcl
 resource "libvirt_volume" "kernel" {
   source = "http://download.opensuse.org/tumbleweed/repo/oss/boot/x86_64/loader/linux"
-  name = "kernel"
-  pool = "default"
+  name   = "kernel"
+  pool   = "default"
   format = "raw"
 }
 
 resource "libvirt_domain" "domain-suse" {
-  name = "suse"
+  name   = "suse"
   memory = "1024"
-  vcpu = 1
+  vcpu   = 1
 
-  kernel = "${libvirt_volume.kernel.id}"
+  kernel = libvirt_volume.kernel.id
 
   // ...
 }
@@ -95,11 +95,11 @@ You can use it in the same way as the kernel.
 
 ```hcl
 resource "libvirt_domain" "domain-suse" {
-  name = "suse"
+  name   = "suse"
   memory = "1024"
-  vcpu = 1
+  vcpu   = 1
 
-  kernel = "${libvirt_volume.kernel.id}"
+  kernel = libvirt_volume.kernel.id
 
   cmdline = [
    {
@@ -168,12 +168,12 @@ So you should typically use the firmware as this,
 
 ```hcl
 resource "libvirt_domain" "my_machine" {
-  name = "my_machine"
+  name     = "my_machine"
   firmware = "/usr/share/qemu/ovmf-x86_64-code.bin"
-  memory = "2048"
+  memory   = "2048"
 
   disk {
-    volume_id = "${libvirt_volume.volume.id}"
+    volume_id = libvirt_volume.volume.id
   }
   ...
 }
@@ -192,15 +192,15 @@ look like this:
 
 ```hcl
 resource "libvirt_domain" "my_machine" {
-  name = "my_machine"
+  name     = "my_machine"
   firmware = "/usr/share/qemu/ovmf-x86_64-code.bin"
   nvram {
     file = "/usr/local/share/qemu/custom-vars.bin"
   }
   memory = "2048"
 
   disk {
-    volume_id = "${libvirt_volume.volume.id}"
+    volume_id = libvirt_volume.volume.id
   }
   ...
 }
@@ -212,7 +212,7 @@ coming from a template, the domain definition should look like this:
 
 ```hcl
 resource "libvirt_domain" "my_machine" {
-  name = "my_machine"
+  name     = "my_machine"
   firmware = "/usr/share/qemu/ovmf-x86_64-code.bin"
   nvram {
     file = "/usr/local/share/qemu/custom-vars.bin"
@@ -221,7 +221,7 @@ resource "libvirt_domain" "my_machine" {
   memory = "2048"
 
   disk {
-    volume_id = "${libvirt_volume.volume.id}"
+    volume_id = libvirt_volume.volume.id
   }
   ...
 }
@@ -245,20 +245,20 @@ a scsi controller, if not specified then a random wwn is generated for the disk
 
 ```hcl
 resource "libvirt_volume" "leap" {
-  name = "leap"
+  name   = "leap"
   source = "http://someurl/openSUSE_Leap-42.1.qcow2"
 }
 
 resource "libvirt_volume" "mydisk" {
-  name = "mydisk"
-  base_volume_id = "${libvirt_volume.leap.id}"
+  name           = "mydisk"
+  base_volume_id = libvirt_volume.leap.id
 }
 
 resource "libvirt_domain" "domain1" {
   name = "domain1"
   disk {
-    volume_id = "${libvirt_volume.mydisk.id}"
-    scsi = "true"
+    volume_id = libvirt_volume.mydisk.id
+    scsi      = "true"
   }
 
   disk {
@@ -279,10 +279,10 @@ the following examples:
 resource "libvirt_domain" "my_machine" {
   ...
   disk {
-    volume_id = "${libvirt_volume.volume1.id}"
+    volume_id = libvirt_volume.volume1.id
   }
   disk {
-    volume_id = "${libvirt_volume.volume2.id}"
+    volume_id = libvirt_volume.volume2.id
   }
 }
 ```
@@ -292,10 +292,10 @@ resource "libvirt_domain" "my_machine" {
   ...
   disk = [
     {
-      volume_id = "${libvirt_volume.volume1.id}"
+      volume_id = libvirt_volume.volume1.id
     },
     {
-      volume_id = "${libvirt_volume.volume2.id}"
+      volume_id = libvirt_volume.volume2.id
     }
   ]
 }
@@ -304,7 +304,7 @@ resource "libvirt_domain" "my_machine" {
 ```hcl
 resource "libvirt_domain" "my_machine" {
   ...
-  disk = ["${var.disk_map_list}"]
+  disk = [var.disk_map_list]
 }
 ```
 
@@ -319,10 +319,10 @@ resource "libvirt_domain" "domain1" {
   name = "domain1"
 
   network_interface {
-    network_id = "${libvirt_network.net1.id}"
-    hostname = "master"
-    addresses = ["10.17.3.3"]
-    mac = "AA:BB:CC:11:22:22"
+    network_id     = libvirt_network.net1.id
+    hostname       = "master"
+    addresses      = ["10.17.3.3"]
+    mac            = "AA:BB:CC:11:22:22"
     wait_for_lease = true
   }
 }
@@ -408,7 +408,7 @@ The `graphics` block will look as follows:
 resource "libvirt_domain" "my_machine" {
   ...
   graphics {
-    type = "vnc"
+    type        = "vnc"
     listen_type = "address"
   }
 }
@@ -440,7 +440,7 @@ The block looks as follows:
 resource "libvirt_domain" "my_machine" {
   ...
   console {
-    type = "pty"
+    type        = "pty"
     target_port = "0"
     target_type = <"serial" or "virtio">
     source_path = "/dev/pts/4"
@@ -513,13 +513,13 @@ Example:
 
 ```hcl
 filesystem {
-  source = "/tmp"
-  target = "tmp"
+  source   = "/tmp"
+  target   = "tmp"
   readonly = false
 }
 filesystem {
-  source = "/proc"
-  target = "proc"
+  source   = "/proc"
+  target   = "proc"
   readonly = true
 }
 ```

website/docs/r/network.markdown

@@ -138,14 +138,14 @@ An advanced example of round-robin DNS (using DNS host templates) follows:
 resource "libvirt_network" "my_network" {
   ...
   dns = {
-    hosts { "${flatten(data.libvirt_network_dns_host_template.hosts.*.rendered)}" }
+    hosts { flatten(data.libvirt_network_dns_host_template.hosts.*.rendered) }
   }
   ...
 }
 
 data "libvirt_network_dns_host_template" "hosts" {
-  count = "${var.host_count}"
-  ip = "${var.host_ips[count.index]}"
+  count    = var.host_count
+  ip       = var.host_ips[count.index]
   hostname = "my_host"
 }
 ```
@@ -154,17 +154,17 @@ An advanced example of setting up multiple SRV records using DNS SRV templates i
 
 ```hcl
 data "libvirt_network_dns_srv_template" "etcd_cluster" {
-  count = "${var.etcd_count}"
-  service = "etcd-server"
+  count    = var.etcd_count
+  service  = "etcd-server"
   protocol = "tcp"
-  domain = "${discovery_domain}"
-  target = "${var.cluster_name}-etcd-${count.index}.${discovery_domain}"
+  domain   = var.discovery_domain
+  target   = "${var.cluster_name}-etcd-${count.index}.${discovery_domain}"
 }
 
 resource "libvirt_network" "k8snet" {
   ...
   dns = [{
-    srvs = [ "${flatten(data.libvirt_network_dns_srv_template.etcd_cluster.*.rendered)}" ]
+    srvs = [ flatten(data.libvirt_network_dns_srv_template.etcd_cluster.*.rendered) ]
   }]
   ...
 }
@@ -179,7 +179,7 @@ resource "libvirt_network" "k8snet" {
 					mode      = "nat"
 					domain    = "k8s.local"
 					addresses = ["10.17.3.0/24"]
-					dhcp {
+					dhcp = {
 						enabled = true
 					}
 ```

website/docs/r/pool.html.markdown

@@ -24,8 +24,8 @@ resource "libvirt_pool" "cluster" {
 }
 
 resource "libvirt_volume" "opensuse_leap" {
-  name = "opensuse_leap"
-  pool = "${libvirt_pool.cluster.name}"
+  name   = "opensuse_leap"
+  pool   = libvirt_pool.cluster.name
   source = "http://download.opensuse.org/repositories/Cloud:/Images:/Leap_42.1/images/openSUSE-Leap-42.1-OpenStack.x86_64.qcow2"
 }
 ```

website/docs/r/volume.html.markdown

@@ -17,21 +17,21 @@ Manages a storage volume in libvirt. For more information see
 # Base OS image to use to create a cluster of different
 # nodes
 resource "libvirt_volume" "opensuse_leap" {
-  name = "opensuse_leap"
+  name   = "opensuse_leap"
   source = "http://download.opensuse.org/repositories/Cloud:/Images:/Leap_42.1/images/openSUSE-Leap-42.1-OpenStack.x86_64.qcow2"
 }
 
 # volume to attach to the "master" domain as main disk
 resource "libvirt_volume" "master" {
   name           = "master.qcow2"
-  base_volume_id = "${libvirt_volume.opensuse_leap.id}"
+  base_volume_id = libvirt_volume.opensuse_leap.id
 }
 
 # volumes to attach to the "workers" domains as main disk
 resource "libvirt_volume" "worker" {
   name           = "worker_${count.index}.qcow2"
-  base_volume_id = "${libvirt_volume.opensuse_leap.id}"
-  count          = "${var.workers_count}"
+  base_volume_id = libvirt_volume.opensuse_leap.id
+  count          = var.workers_count
 }
 ```