Updates to GCE Instances and Instance Templates to allow for false values to be set for the auto_delete setting.
This commit is contained in:
parent
18a83347b5
commit
988da2f90b
|
@ -72,6 +72,7 @@ func resourceComputeInstance() *schema.Resource {
|
||||||
"auto_delete": &schema.Schema{
|
"auto_delete": &schema.Schema{
|
||||||
Type: schema.TypeBool,
|
Type: schema.TypeBool,
|
||||||
Optional: true,
|
Optional: true,
|
||||||
|
Default: true,
|
||||||
ForceNew: true,
|
ForceNew: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -283,11 +284,7 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
|
||||||
disk.Type = "PERSISTENT"
|
disk.Type = "PERSISTENT"
|
||||||
disk.Mode = "READ_WRITE"
|
disk.Mode = "READ_WRITE"
|
||||||
disk.Boot = i == 0
|
disk.Boot = i == 0
|
||||||
disk.AutoDelete = true
|
disk.AutoDelete = d.Get(prefix + ".auto_delete").(bool)
|
||||||
|
|
||||||
if v, ok := d.GetOk(prefix + ".auto_delete"); ok {
|
|
||||||
disk.AutoDelete = v.(bool)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load up the disk for this disk if specified
|
// Load up the disk for this disk if specified
|
||||||
if v, ok := d.GetOk(prefix + ".disk"); ok {
|
if v, ok := d.GetOk(prefix + ".disk"); ok {
|
||||||
|
|
|
@ -58,6 +58,7 @@ func resourceComputeInstanceTemplate() *schema.Resource {
|
||||||
"auto_delete": &schema.Schema{
|
"auto_delete": &schema.Schema{
|
||||||
Type: schema.TypeBool,
|
Type: schema.TypeBool,
|
||||||
Optional: true,
|
Optional: true,
|
||||||
|
Default: true,
|
||||||
ForceNew: true,
|
ForceNew: true,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -235,11 +236,7 @@ func buildDisks(d *schema.ResourceData, meta interface{}) []*compute.AttachedDis
|
||||||
disk.Mode = "READ_WRITE"
|
disk.Mode = "READ_WRITE"
|
||||||
disk.Interface = "SCSI"
|
disk.Interface = "SCSI"
|
||||||
disk.Boot = i == 0
|
disk.Boot = i == 0
|
||||||
disk.AutoDelete = true
|
disk.AutoDelete = d.Get(prefix + ".auto_delete").(bool)
|
||||||
|
|
||||||
if v, ok := d.GetOk(prefix + ".auto_delete"); ok {
|
|
||||||
disk.AutoDelete = v.(bool)
|
|
||||||
}
|
|
||||||
|
|
||||||
if v, ok := d.GetOk(prefix + ".boot"); ok {
|
if v, ok := d.GetOk(prefix + ".boot"); ok {
|
||||||
disk.Boot = v.(bool)
|
disk.Boot = v.(bool)
|
||||||
|
|
Loading…
Reference in New Issue