diff options
| author | Duncan Mac-Vicar P <dmacvicar@gmail.com> | 2016-07-02 01:09:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-02 01:09:28 +0200 |
| commit | 51329134103b56c74a27289d63dde11bcf800a39 (patch) | |
| tree | 3afd1b41f24e18d32331f5a064af57bb9caf2359 /libvirt | |
| parent | 5fc692827088701e73e4d61857cf5eaeca50749a (diff) | |
| parent | 2dddaec9ca0a450578e7cccf0c74d704939b8252 (diff) | |
| download | terraform-provider-libvirt-51329134103b56c74a27289d63dde11bcf800a39.tar terraform-provider-libvirt-51329134103b56c74a27289d63dde11bcf800a39.tar.gz | |
Merge pull request #45 from moio/fix-metadata-refreshing
Bugfix: metadata always need refreshing
Diffstat (limited to 'libvirt')
| -rw-r--r-- | libvirt/domain_def.go | 11 | ||||
| -rw-r--r-- | libvirt/resource_libvirt_domain.go | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libvirt/domain_def.go b/libvirt/domain_def.go index 521a2b37..1b59174f 100644 --- a/libvirt/domain_def.go +++ b/libvirt/domain_def.go @@ -11,7 +11,10 @@ type defDomain struct { Os defOs `xml:"os"` Memory defMemory `xml:"memory"` VCpu defVCpu `xml:"vcpu"` - Metadata defMetadata + Metadata struct { + XMLName xml.Name `xml:"metadata"` + TerraformLibvirt defMetadata + } Features struct { Acpi string `xml:"acpi"` Apic string `xml:"apic"` @@ -28,10 +31,8 @@ type defDomain struct { } type defMetadata struct { - XMLName xml.Name `xml:"metadata"` - TerraformLibvirt struct { - Xml string `xml:",cdata"` - } `xml:"http://github.com/dmacvicar/terraform-provider-libvirt/ user_data"` + XMLName xml.Name `xml:"http://github.com/dmacvicar/terraform-provider-libvirt/ user_data"` + Xml string `xml:",cdata"` } type defOs struct { diff --git a/libvirt/resource_libvirt_domain.go b/libvirt/resource_libvirt_domain.go index 67c95b38..ed2fd526 100644 --- a/libvirt/resource_libvirt_domain.go +++ b/libvirt/resource_libvirt_domain.go @@ -367,9 +367,8 @@ func resourceLibvirtDomainUpdate(d *schema.ResourceData, meta interface{}) error } if d.HasChange("metadata") { - //terraform-libvirt:user_data xmlns:terraform-libvirt="http://github.com/dmacvicar/terraform-provider-libvirt/" metadata := defMetadata{} - metadata.TerraformLibvirt.Xml = d.Get("metadata").(string) + metadata.Xml = d.Get("metadata").(string) metadataToXml, err := xml.Marshal(metadata) if err != nil { return fmt.Errorf("Error serializing libvirt metadata: %s", err) |