Wait for LB to be ACTIVE on HM update (kubernetes#2280)

This commit makes sure that on exit from UpdateHealthMonitor() the LB is
ACTIVE so that next operations can be called safely.

Author: dulek

pkg/openstack/loadbalancer.go

@@ -1099,7 +1099,7 @@ func (lbaas *LbaasV2) ensureOctaviaHealthMonitor(lbID string, name string, pool
 			MaxRetriesDown: svcConf.healthMonitorMaxRetriesDown,
 		}
 		klog.Infof("Updating health monitor %s updateOpts %+v", monitorID, updateOpts)
-		return openstackutil.UpdateHealthMonitor(lbaas.lb, monitorID, updateOpts)
+		return openstackutil.UpdateHealthMonitor(lbaas.lb, monitorID, updateOpts, lbID)
 	}
 
 	return nil

pkg/util/openstack/loadbalancer.go

@@ -668,13 +668,17 @@ func CreateL7Rule(client *gophercloud.ServiceClient, policyID string, opts l7pol
 }
 
 // UpdateHealthMonitor updates a health monitor.
-func UpdateHealthMonitor(client *gophercloud.ServiceClient, monitorID string, opts monitors.UpdateOpts) error {
+func UpdateHealthMonitor(client *gophercloud.ServiceClient, monitorID string, opts monitors.UpdateOpts, lbID string) error {
 	mc := metrics.NewMetricContext("loadbalancer_healthmonitor", "update")
 	_, err := monitors.Update(client, monitorID, opts).Extract()
 	if mc.ObserveRequest(err) != nil {
 		return fmt.Errorf("failed to update healthmonitor: %v", err)
 	}
 
+	if _, err := WaitActiveAndGetLoadBalancer(client, lbID); err != nil {
+		return fmt.Errorf("failed to wait for load balancer %s ACTIVE after updating healthmonitor: %v", lbID, err)
+	}
+
 	return nil
 }