Merge "LBAAS config generation on controller"

Juniper · Apr 5, 2016 · 22999f0 · 22999f0
2 parents 7aac764 + 1fa66c1
commit 22999f0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/config/svc-monitor/svc_monitor/services/loadbalancer/drivers/ha_proxy/driver.py b/src/config/svc-monitor/svc_monitor/services/loadbalancer/drivers/ha_proxy/driver.py
@@ -405,10 +405,10 @@ def set_haproxy_config(self, si_id, lb_uuid, conf):
         if not si:
             return
 
-        for kv in si.kvps:
+        for kv in si.kvps or []:
             if kv['key'] == 'haproxy_config':
-                 if kv['value'] == conf:
-                     return
+                if kv['value'] == conf:
+                    return
 
         si_obj = ServiceInstance()
         si_obj.uuid = si.uuid