Skip to content

Commit

Permalink
Merge branch 'v1.6.1/refresh-fixes' of github.com:josenk/terraform-pr…
Browse files Browse the repository at this point in the history
…ovider-esxi into v1.6.1/refresh-fixes
  • Loading branch information
josenk committed Dec 7, 2019
2 parents 9d77e68 + dbfd1a5 commit 02ef9c1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions esxi/guest-read.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ func resourceGUESTRead(d *schema.ResourceData, m interface{}) error {
d.Set("ip_address", ip_address)
d.Set("power", power)
d.Set("notes", notes)

if len(guestinfo) != 0 {
d.Set("guestinfo", guestinfo)
}
Expand Down
2 changes: 2 additions & 0 deletions esxi/resource_guest.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,12 +251,14 @@ func resourceGUESTCreate(d *schema.ResourceData, m interface{}) error {
} else {
d.Set("guest_startup_timeout", 120)
}

if d.Get("guest_shutdown_timeout").(int) >= 0 {
d.Set("guest_shutdown_timeout", d.Get("guest_shutdown_timeout").(int))
guest_shutdown_timeout = d.Get("guest_shutdown_timeout").(int)
} else {
d.Set("guest_shutdown_timeout", 20)
}

if d.Get("ovf_properties_timer").(int) >= 0 {
d.Set("ovf_properties_timer", d.Get("ovf_properties_timer").(int))
ovf_properties_timer = d.Get("ovf_properties_timer").(int)
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.6.1
v1.6.1

0 comments on commit 02ef9c1

Please sign in to comment.