mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-01 16:21:06 +00:00
Fixed - allow to attach already existing disks
This commit is contained in:
parent
10bf8628a4
commit
6aa3d2f0ec
@ -151,12 +151,19 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
|
|||||||
for i := 0; i < disksCount; i++ {
|
for i := 0; i < disksCount; i++ {
|
||||||
prefix := fmt.Sprintf("disk.%d", i)
|
prefix := fmt.Sprintf("disk.%d", i)
|
||||||
|
|
||||||
var sourceLink string
|
// var sourceLink string
|
||||||
|
|
||||||
|
// Build the disk
|
||||||
|
var disk compute.AttachedDisk
|
||||||
|
disk.Type = "PERSISTENT"
|
||||||
|
disk.Mode = "READ_WRITE"
|
||||||
|
disk.Boot = i == 0
|
||||||
|
disk.AutoDelete = true
|
||||||
|
|
||||||
// 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 {
|
||||||
diskName := v.(string)
|
diskName := v.(string)
|
||||||
disk, err := config.clientCompute.Disks.Get(
|
diskData, err := config.clientCompute.Disks.Get(
|
||||||
config.Project, zone.Name, diskName).Do()
|
config.Project, zone.Name, diskName).Do()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf(
|
return fmt.Errorf(
|
||||||
@ -164,7 +171,7 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
|
|||||||
diskName, err)
|
diskName, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceLink = disk.SelfLink
|
disk.Source = diskData.SelfLink
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load up the image for this disk if specified
|
// Load up the image for this disk if specified
|
||||||
@ -177,17 +184,9 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
|
|||||||
imageName, err)
|
imageName, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceLink = image.SelfLink
|
disk.InitializeParams = &compute.AttachedDiskInitializeParams{
|
||||||
}
|
SourceImage: image.SelfLink,
|
||||||
|
}
|
||||||
// Build the disk
|
|
||||||
var disk compute.AttachedDisk
|
|
||||||
disk.Type = "PERSISTENT"
|
|
||||||
disk.Mode = "READ_WRITE"
|
|
||||||
disk.Boot = i == 0
|
|
||||||
disk.AutoDelete = true
|
|
||||||
disk.InitializeParams = &compute.AttachedDiskInitializeParams{
|
|
||||||
SourceImage: sourceLink,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
disks = append(disks, &disk)
|
disks = append(disks, &disk)
|
||||||
|
Loading…
Reference in New Issue
Block a user