summaryrefslogtreecommitdiff
path: root/libvirt/coreos_ignition_def.go
diff options
context:
space:
mode:
authorThomas Hipp <thomashipp@gmail.com>2017-11-16 15:38:34 +0100
committerGitHub <noreply@github.com>2017-11-16 15:38:34 +0100
commitacad5df18a9ffd03d6f6bdd2b33f4eade8e9a09d (patch)
tree286d4f3913968f3706b0f286c76b6c08a8e5c611 /libvirt/coreos_ignition_def.go
parent189901b858338555651fcae7b3638a7f6d697202 (diff)
parent3a4cd93e91aad054f89491e9f91fba6cf92dbc19 (diff)
downloadterraform-provider-libvirt-acad5df18a9ffd03d6f6bdd2b33f4eade8e9a09d.tar
terraform-provider-libvirt-acad5df18a9ffd03d6f6bdd2b33f4eade8e9a09d.tar.gz
Merge pull request #208 from MalloZup/travis-lint
Enable golint on travis, fixing all issues
Diffstat (limited to 'libvirt/coreos_ignition_def.go')
-rw-r--r--libvirt/coreos_ignition_def.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/libvirt/coreos_ignition_def.go b/libvirt/coreos_ignition_def.go
index 084979fc..4e77b199 100644
--- a/libvirt/coreos_ignition_def.go
+++ b/libvirt/coreos_ignition_def.go
@@ -75,13 +75,13 @@ func (ign *defIgnition) CreateAndUpload(virConn *libvirt.Connect) (string, error
volumeDef.Capacity.Value = size
volumeDef.Target.Format.Type = "raw"
- volumeDefXml, err := xml.Marshal(volumeDef)
+ volumeDefXML, err := xml.Marshal(volumeDef)
if err != nil {
return "", fmt.Errorf("Error serializing libvirt volume: %s", err)
}
// create the volume
- volume, err := pool.StorageVolCreateXML(string(volumeDefXml), 0)
+ volume, err := pool.StorageVolCreateXML(string(volumeDefXML), 0)
if err != nil {
return "", fmt.Errorf("Error creating libvirt volume for Ignition %s: %s", ign.Name, err)
}
@@ -131,7 +131,7 @@ func (ign *defIgnition) createFile() (string, error) {
file = true
if _, err := os.Stat(ign.Content); err != nil {
var js map[string]interface{}
- if err_conf := json.Unmarshal([]byte(ign.Content), &js); err_conf != nil {
+ if errConf := json.Unmarshal([]byte(ign.Content), &js); errConf != nil {
return "", fmt.Errorf("coreos_ignition 'content' is neither a file "+
"nor a valid json object %s", ign.Content)
}