ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor volume fixes 

This commit follows suit of #1897 by fixing volume-related
parameters which allow the volume attach acceptance test
to work. It also re-enables the volume attach test.
This commit is contained in:
Joe Topjian 2015-05-14 02:06:21 +00:00
parent 88dde91e15
commit 4daaacd292
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/providers/openstack/resource_openstack_blockstorage_volume_v1.go
View File

@ -53,6 +53,7 @@ func resourceBlockStorageVolumeV1() *schema.Resource {
Type: schema.TypeMap, Type: schema.TypeMap,
Optional: true, Optional: true,
ForceNew: false, ForceNew: false,
Computed: true,
}, },
"snapshot_id": &schema.Schema{ "snapshot_id": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,

2
builtin/providers/openstack/resource_openstack_compute_instance_v2.go
View File

@ -209,7 +209,6 @@ func resourceComputeInstanceV2() *schema.Resource {
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"id": &schema.Schema{ "id": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true,
Computed: true, Computed: true,
}, },
"volume_id": &schema.Schema{ "volume_id": &schema.Schema{
@ -955,7 +954,6 @@ func resourceComputeVolumeAttachmentHash(v interface{}) int {
var buf bytes.Buffer var buf bytes.Buffer
m := v.(map[string]interface{}) m := v.(map[string]interface{})
buf.WriteString(fmt.Sprintf("%s-", m["volume_id"].(string))) buf.WriteString(fmt.Sprintf("%s-", m["volume_id"].(string)))
buf.WriteString(fmt.Sprintf("%s-", m["device"].(string)))
return hashcode.String(buf.String()) return hashcode.String(buf.String())
} }

3
builtin/providers/openstack/resource_openstack_compute_instance_v2_test.go
View File

@ -46,7 +46,7 @@ func TestAccComputeV2Instance_basic(t *testing.T) {
}) })
} }
func _TestAccComputeV2Instance_volumeAttach(t *testing.T) { func TestAccComputeV2Instance_volumeAttach(t *testing.T) {
var instance servers.Server var instance servers.Server
var volume volumes.Volume var volume volumes.Volume
@ -229,6 +229,7 @@ var testAccComputeV2Instance_volumeAttach = fmt.Sprintf(`
resource "openstack_compute_instance_v2" "foo" { resource "openstack_compute_instance_v2" "foo" {
region = "%s" region = "%s"
name = "terraform-test" name = "terraform-test"
security_groups = ["default"]
volume { volume {
volume_id = "${openstack_blockstorage_volume_v1.myvol.id}" volume_id = "${openstack_blockstorage_volume_v1.myvol.id}"
} }