steps/infra/libvirt: use the upstream dns hosts implementation

It is slightly different than the crawford fork.
openshift · Sep 6, 2018 · 7e29113 · 7e29113
1 parent 13a7dbb
commit 7e29113
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Documentation/dev/libvirt-howto.md b/Documentation/dev/libvirt-howto.md
@@ -79,7 +79,7 @@ echo server=/tt.testing/192.168.124.1 | sudo tee /etc/NetworkManager/dnsmasq.d/t
 1. Make sure you have the `virsh` binary installed: `sudo dnf install libvirt-client libvirt-devel`
 2. Install the libvirt terraform provider:
 ```sh
-GOBIN=~/.terraform.d/plugins go get github.com/crawford/terraform-provider-libvirt
+GOBIN=~/.terraform.d/plugins go get -u github.com/dmacvicar/terraform-provider-libvirt
 ```
 
 #### 1.9 Cache terrafrom plugins (optional, but makes subsequent runs a bit faster)

diff --git a/steps/infra/libvirt/main.tf b/steps/infra/libvirt/main.tf
@@ -44,16 +44,16 @@ resource "libvirt_network" "tectonic_net" {
   ]
 
   dns = [{
-    local_only = true,
+    local_only = true
+
+    hosts = ["${flatten(list(
+      data.libvirt_network_dns_host_template.bootstrap.*.rendered,
+      data.libvirt_network_dns_host_template.masters.*.rendered,
+      data.libvirt_network_dns_host_template.etcds.*.rendered,
+      data.libvirt_network_dns_host_template.workers.*.rendered,
+    ))}"]
   }]
 
-  dns_host = ["${flatten(list(
-    data.libvirt_network_dns_host_template.bootstrap.*.rendered,
-    data.libvirt_network_dns_host_template.masters.*.rendered,
-    data.libvirt_network_dns_host_template.etcds.*.rendered,
-    data.libvirt_network_dns_host_template.workers.*.rendered,
-  ))}"]
-
   autostart = true
 }