From e453decec833c5992b6692714cf76b1d0b69949e Mon Sep 17 00:00:00 2001 From: Guillaume Giamarchi Date: Wed, 7 Oct 2015 22:15:54 +0200 Subject: [PATCH] Fix OpenStack provider idempotency bugs --- .../providers/openstack/resource_openstack_fw_firewall_v1.go | 2 +- builtin/providers/openstack/resource_openstack_lb_monitor_v1.go | 1 + .../openstack/resource_openstack_networking_floatingip_v2.go | 2 +- .../openstack/resource_openstack_networking_network_v2.go | 1 + .../openstack/resource_openstack_networking_router_v2.go | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin/providers/openstack/resource_openstack_fw_firewall_v1.go b/builtin/providers/openstack/resource_openstack_fw_firewall_v1.go index c7dcf02ef9..2fa505e56e 100644 --- a/builtin/providers/openstack/resource_openstack_fw_firewall_v1.go +++ b/builtin/providers/openstack/resource_openstack_fw_firewall_v1.go @@ -40,7 +40,7 @@ func resourceFWFirewallV1() *schema.Resource { "admin_state_up": &schema.Schema{ Type: schema.TypeBool, Optional: true, - Default: true, + Computed: true, }, "tenant_id": &schema.Schema{ Type: schema.TypeString, diff --git a/builtin/providers/openstack/resource_openstack_lb_monitor_v1.go b/builtin/providers/openstack/resource_openstack_lb_monitor_v1.go index 0e96762723..8774dadca0 100644 --- a/builtin/providers/openstack/resource_openstack_lb_monitor_v1.go +++ b/builtin/providers/openstack/resource_openstack_lb_monitor_v1.go @@ -68,6 +68,7 @@ func resourceLBMonitorV1() *schema.Resource { Type: schema.TypeString, Optional: true, ForceNew: false, + Computed: true, }, }, } diff --git a/builtin/providers/openstack/resource_openstack_networking_floatingip_v2.go b/builtin/providers/openstack/resource_openstack_networking_floatingip_v2.go index 37f1ca7cfe..5c7575bf16 100644 --- a/builtin/providers/openstack/resource_openstack_networking_floatingip_v2.go +++ b/builtin/providers/openstack/resource_openstack_networking_floatingip_v2.go @@ -37,7 +37,7 @@ func resourceNetworkingFloatingIPV2() *schema.Resource { "port_id": &schema.Schema{ Type: schema.TypeString, Optional: true, - Default: "", + Computed: true, }, }, } diff --git a/builtin/providers/openstack/resource_openstack_networking_network_v2.go b/builtin/providers/openstack/resource_openstack_networking_network_v2.go index 521daecfb2..b4a3db7ef6 100644 --- a/builtin/providers/openstack/resource_openstack_networking_network_v2.go +++ b/builtin/providers/openstack/resource_openstack_networking_network_v2.go @@ -32,6 +32,7 @@ func resourceNetworkingNetworkV2() *schema.Resource { Type: schema.TypeString, Optional: true, ForceNew: false, + Computed: true, }, "shared": &schema.Schema{ Type: schema.TypeString, diff --git a/builtin/providers/openstack/resource_openstack_networking_router_v2.go b/builtin/providers/openstack/resource_openstack_networking_router_v2.go index 9a370d7f3a..aefc910bfd 100644 --- a/builtin/providers/openstack/resource_openstack_networking_router_v2.go +++ b/builtin/providers/openstack/resource_openstack_networking_router_v2.go @@ -32,6 +32,7 @@ func resourceNetworkingRouterV2() *schema.Resource { Type: schema.TypeBool, Optional: true, ForceNew: false, + Computed: true, }, "external_gateway": &schema.Schema{ Type: schema.TypeString,