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

Merge pull request #5557 from pfrybar/master 

provider/openstack: Fix create/delete statuses in load balancing resources for openstack provider.
This commit is contained in:
Joe Topjian 2016-03-10 22:46:36 -07:00
parent 14ca7e3156 d8c9e448d4
commit edb30d52c6
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,6 +85,7 @@ func resourceLBMemberV1Create(d *schema.ResourceData, meta interface{}) error {
log.Printf("[DEBUG] Waiting for OpenStack LB member (%s) to become available.", m.ID) log.Printf("[DEBUG] Waiting for OpenStack LB member (%s) to become available.", m.ID)
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"PENDING_CREATE"},
Target: []string{"ACTIVE"}, Target: []string{"ACTIVE"},
Refresh: waitForLBMemberActive(networkingClient, m.ID), Refresh: waitForLBMemberActive(networkingClient, m.ID),
Timeout: 2 * time.Minute, Timeout: 2 * time.Minute,
@ -158,7 +159,7 @@ func resourceLBMemberV1Delete(d *schema.ResourceData, meta interface{}) error {
} }
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"ACTIVE"}, Pending: []string{"ACTIVE", "PENDING_DELETE"},
Target: []string{"DELETED"}, Target: []string{"DELETED"},
Refresh: waitForLBMemberDelete(networkingClient, d.Id()), Refresh: waitForLBMemberDelete(networkingClient, d.Id()),
Timeout: 2 * time.Minute, Timeout: 2 * time.Minute,

4
builtin/providers/openstack/resource_openstack_lb_monitor_v1.go
View File

@ -115,7 +115,7 @@ func resourceLBMonitorV1Create(d *schema.ResourceData, meta interface{}) error {
log.Printf("[DEBUG] Waiting for OpenStack LB Monitor (%s) to become available.", m.ID) log.Printf("[DEBUG] Waiting for OpenStack LB Monitor (%s) to become available.", m.ID)
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"PENDING"}, Pending: []string{"PENDING_CREATE"},
Target: []string{"ACTIVE"}, Target: []string{"ACTIVE"},
Refresh: waitForLBMonitorActive(networkingClient, m.ID), Refresh: waitForLBMonitorActive(networkingClient, m.ID),
Timeout: 2 * time.Minute, Timeout: 2 * time.Minute,
@ -205,7 +205,7 @@ func resourceLBMonitorV1Delete(d *schema.ResourceData, meta interface{}) error {
} }
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"ACTIVE", "PENDING"}, Pending: []string{"ACTIVE", "PENDING_DELETE"},
Target: []string{"DELETED"}, Target: []string{"DELETED"},
Refresh: waitForLBMonitorDelete(networkingClient, d.Id()), Refresh: waitForLBMonitorDelete(networkingClient, d.Id()),
Timeout: 2 * time.Minute, Timeout: 2 * time.Minute,

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

@ -128,6 +128,7 @@ func resourceLBPoolV1Create(d *schema.ResourceData, meta interface{}) error {
log.Printf("[DEBUG] Waiting for OpenStack LB pool (%s) to become available.", p.ID) log.Printf("[DEBUG] Waiting for OpenStack LB pool (%s) to become available.", p.ID)
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"PENDING_CREATE"},
Target: []string{"ACTIVE"}, Target: []string{"ACTIVE"},
Refresh: waitForLBPoolActive(networkingClient, p.ID), Refresh: waitForLBPoolActive(networkingClient, p.ID),
Timeout: 2 * time.Minute, Timeout: 2 * time.Minute,
@ -291,7 +292,7 @@ func resourceLBPoolV1Delete(d *schema.ResourceData, meta interface{}) error {
} }
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"ACTIVE"}, Pending: []string{"ACTIVE", "PENDING_DELETE"},
Target: []string{"DELETED"}, Target: []string{"DELETED"},
Refresh: waitForLBPoolDelete(networkingClient, d.Id()), Refresh: waitForLBPoolDelete(networkingClient, d.Id()),
Timeout: 2 * time.Minute, Timeout: 2 * time.Minute,

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

@ -264,7 +264,7 @@ func resourceLBVipV1Delete(d *schema.ResourceData, meta interface{}) error {
} }
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"ACTIVE"}, Pending: []string{"ACTIVE", "PENDING_DELETE"},
Target: []string{"DELETED"}, Target: []string{"DELETED"},
Refresh: waitForLBVIPDelete(networkingClient, d.Id()), Refresh: waitForLBVIPDelete(networkingClient, d.Id()),
Timeout: 2 * time.Minute, Timeout: 2 * time.Minute,