diff options
| author | Duncan Mac-Vicar P <dmacvicar@suse.de> | 2017-11-23 14:23:15 +0100 |
|---|---|---|
| committer | Duncan Mac-Vicar P <dmacvicar@suse.de> | 2017-11-24 17:56:44 +0100 |
| commit | a1145d25f878d0fc70229428c8076c27423d5a07 (patch) | |
| tree | d1bbc6df6939755902d53f616c6ae7dc06650b9c /libvirt/resource_libvirt_domain.go | |
| parent | 06f312e1ca81074d3806816535d3039251691fb4 (diff) | |
| download | terraform-provider-libvirt-a1145d25f878d0fc70229428c8076c27423d5a07.tar terraform-provider-libvirt-a1145d25f878d0fc70229428c8076c27423d5a07.tar.gz | |
Read back cmdline, initrd and kernel attributes from the resource
Diffstat (limited to 'libvirt/resource_libvirt_domain.go')
| -rw-r--r-- | libvirt/resource_libvirt_domain.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libvirt/resource_libvirt_domain.go b/libvirt/resource_libvirt_domain.go index 272d1eec..4dae7c29 100644 --- a/libvirt/resource_libvirt_domain.go +++ b/libvirt/resource_libvirt_domain.go @@ -305,7 +305,6 @@ func resourceLibvirtDomainCreate(d *schema.ResourceData, meta interface{}) error cmdlineArgs = append(cmdlineArgs, fmt.Sprintf("%s=%v", k, v)) } } - sort.Strings(cmdlineArgs) domainDef.OS.KernelArgs = strings.Join(cmdlineArgs, " ") @@ -905,6 +904,14 @@ func resourceLibvirtDomainRead(d *schema.ResourceData, meta interface{}) error { d.Set("autostart", autostart) d.Set("arch", domainDef.OS.Type.Arch) + cmdLines, err := splitKernelCmdLine(domainDef.OS.KernelArgs) + if err != nil { + return err + } + d.Set("cmdline", cmdLines) + d.Set("kernel", domainDef.OS.Kernel) + d.Set("initrd", domainDef.OS.Initrd) + caps, err := getHostCapabilities(virConn) if err != nil { return err |