Merge pull request #543 from rgooch/master

Fix panic in vm-control change-vm-tags when VM has no existing tags.
Symantec · Dec 23, 2018 · 54608bd · 54608bd
2 parents 8c17042 + 5c0f3b8
commit 54608bd
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/cmd/vm-control/changeVmTags.go b/cmd/vm-control/changeVmTags.go
@@ -50,6 +50,9 @@ func changeVmTagsOnHypervisor(hypervisor string, ipAddr net.IP,
 	if err := errors.New(reply.Error); err != nil {
 		return err
 	}
+	if len(reply.VmInfo.Tags) < 1 {
+		return setVmTagsOnHypervisor(client, ipAddr, vmTags, logger)
+	}
 	reply.VmInfo.Tags.Merge(vmTags)
 	for key, value := range reply.VmInfo.Tags {
 		if value == "" {