stackforge/libra
Code Issues Proposed changes

Pass HAProxy config to OS services driver.

Browse Source 
Bug fix. We weren't passing the HAProxy config as a string down
to the OS service module.

Also remove the service_restart() method since it was unused.

Also set a default balancing algorithm.

Change-Id: I8db025488099fed5015d62e0bf9c73c6e6795483
This commit is contained in:
David Shrewsbury
2012-10-29 15:10:36 -04:00
parent 5f23c3f60b
commit 22b53f22c8
5 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libra/worker/controller.py
View File

@@ -125,21 +125,23 @@ class LBaaSController(object):
self.logger.error("Invalid algorithm: %s" % algo)
self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
return self.msg
else:
algo = LoadBalancerDriver.ROUNDROBIN
try:
self.driver.set_algorithm(current_lb['protocol'], algo)
except NotImplementedError:
self.logger.error(
"Selected driver does not support setting algorithm."
)
self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
return self.msg
except Exception as e:
self.logger.error(
"Selected driver failed setting algorithm."
)
self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
return self.msg
try:
self.driver.set_algorithm(current_lb['protocol'], algo)
except NotImplementedError:
self.logger.error(
"Selected driver does not support setting algorithm."
)
self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
return self.msg
except Exception as e:
self.logger.error(
"Selected driver failed setting algorithm."
)
self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
return self.msg
for lb_node in current_lb['nodes']:
port, address = None, None
@@ -183,7 +185,7 @@ class LBaaSController(object):
self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
except Exception as e:
self.logger.error("CREATE failed: %s, %s" % (e.__class__, e))
for lb_node in self.msg['nodes']:
for lb_node in current_lb['nodes']:
lb_node['condition'] = self.NODE_ERR
self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
else: