From 49b01a4f0a219fab6109e77446cc7a2d29fb4960 Mon Sep 17 00:00:00 2001 From: Jon Perritt Date: Wed, 11 Feb 2015 21:56:26 -0700 Subject: [PATCH] update compute instance security group Read operation --- .../openstack/resource_openstack_compute_instance_v2.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/builtin/providers/openstack/resource_openstack_compute_instance_v2.go b/builtin/providers/openstack/resource_openstack_compute_instance_v2.go index 1dc0a16160..6406600ae6 100644 --- a/builtin/providers/openstack/resource_openstack_compute_instance_v2.go +++ b/builtin/providers/openstack/resource_openstack_compute_instance_v2.go @@ -175,7 +175,6 @@ func resourceComputeInstanceV2() *schema.Resource { "volume": &schema.Schema{ Type: schema.TypeSet, Optional: true, - Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "id": &schema.Schema{ @@ -369,19 +368,18 @@ func resourceComputeInstanceV2Read(d *schema.ResourceData, meta interface{}) err d.Set("metadata", server.Metadata) - secGrpNum := 0 + secGrpNames := []string{} err = secgroups.ListByServer(computeClient, d.Id()).EachPage(func(page pagination.Page) (bool, error) { secGrpList, err := secgroups.ExtractSecurityGroups(page) if err != nil { return false, fmt.Errorf("Error getting security groups for OpenStack server: %s", err) } for _, sg := range secGrpList { - d.Set(fmt.Sprintf("security_groups.%d", secGrpNum), sg.Name) - secGrpNum++ + secGrpNames = append(secGrpNames, sg.Name) } return true, nil }) - d.Set("security_groups.#", secGrpNum) + d.Set("security_groups", secGrpNames) flavorId, ok := server.Flavor["id"].(string) if !ok {