provider/openstack Fix LB Member Errors

Fixing Load Balancer Member errors caused by not rebasing with master
before committing.
This commit is contained in:
Joe Topjian 2016-01-31 22:51:26 +00:00
parent d78a473dbb
commit aefd22ed9b
1 changed files with 2 additions and 2 deletions

View File

@ -85,7 +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{
Target: "ACTIVE", Target: []string{"ACTIVE"},
Refresh: waitForLBMemberActive(networkingClient, m.ID), Refresh: waitForLBMemberActive(networkingClient, m.ID),
Timeout: 2 * time.Minute, Timeout: 2 * time.Minute,
Delay: 5 * time.Second, Delay: 5 * time.Second,
@ -159,7 +159,7 @@ func resourceLBMemberV1Delete(d *schema.ResourceData, meta interface{}) error {
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"ACTIVE"}, Pending: []string{"ACTIVE"},
Target: "DELETED", Target: []string{"DELETED"},
Refresh: waitForLBMemberDelete(networkingClient, d.Id()), Refresh: waitForLBMemberDelete(networkingClient, d.Id()),
Timeout: 2 * time.Minute, Timeout: 2 * time.Minute,
Delay: 5 * time.Second, Delay: 5 * time.Second,