From dbe46f9773fb4735ff8c53367ff483ffdfc0d566 Mon Sep 17 00:00:00 2001 From: Thomas Hipp Date: Tue, 19 Sep 2017 09:40:05 +0200 Subject: update Terraform and Go version This updates Terraform to the latest version. Travis will build with go1.9 from now on, since Terraform > 0.10.2 doesn't support go1.8. Glide was run with `--strip-vendor` which removes a lot of unnecessary files. Tests and Docs regarding `ignition` have been updated. This resolves #194. Signed-off-by: Thomas Hipp --- libvirt/resource_libvirt_coreos_ignition_test.go | 8 ++++---- libvirt/resource_libvirt_domain_test.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'libvirt') diff --git a/libvirt/resource_libvirt_coreos_ignition_test.go b/libvirt/resource_libvirt_coreos_ignition_test.go index f4633e21..44e2561d 100644 --- a/libvirt/resource_libvirt_coreos_ignition_test.go +++ b/libvirt/resource_libvirt_coreos_ignition_test.go @@ -12,20 +12,20 @@ import ( func TestAccLibvirtIgnition_Basic(t *testing.T) { var volume libvirt.StorageVol var config = fmt.Sprintf(` - resource "ignition_systemd_unit" "acceptance-test-systemd" { + data "ignition_systemd_unit" "acceptance-test-systemd" { name = "example.service" content = "[Service]\nType=oneshot\nExecStart=/usr/bin/echo Hello World\n\n[Install]\nWantedBy=multi-user.target" } - resource "ignition_config" "acceptance-test-config" { + data "ignition_config" "acceptance-test-config" { systemd = [ - "${ignition_systemd_unit.acceptance-test-systemd.id}", + "${data.ignition_systemd_unit.acceptance-test-systemd.id}", ] } resource "libvirt_ignition" "ignition" { name = "ignition" - content = "${ignition_config.acceptance-test-config.rendered}" + content = "${data.ignition_config.acceptance-test-config.rendered}" } `) diff --git a/libvirt/resource_libvirt_domain_test.go b/libvirt/resource_libvirt_domain_test.go index eaaa2345..472eddae 100644 --- a/libvirt/resource_libvirt_domain_test.go +++ b/libvirt/resource_libvirt_domain_test.go @@ -285,20 +285,20 @@ func TestAccLibvirtDomain_IgnitionObject(t *testing.T) { var volume libvirt.StorageVol var config = fmt.Sprintf(` - resource "ignition_systemd_unit" "acceptance-test-systemd" { + data "ignition_systemd_unit" "acceptance-test-systemd" { name = "example.service" content = "[Service]\nType=oneshot\nExecStart=/usr/bin/echo Hello World\n\n[Install]\nWantedBy=multi-user.target" } - resource "ignition_config" "acceptance-test-config" { + data "ignition_config" "acceptance-test-config" { systemd = [ - "${ignition_systemd_unit.acceptance-test-systemd.id}", + "${data.ignition_systemd_unit.acceptance-test-systemd.id}", ] } resource "libvirt_ignition" "ignition" { name = "ignition" - content = "${ignition_config.acceptance-test-config.rendered}" + content = "${data.ignition_config.acceptance-test-config.rendered}" } resource "libvirt_domain" "acceptance-test-domain" { -- cgit v1.2.3