summaryrefslogtreecommitdiff
path: root/heat/engine/resources/neutron/loadbalancer.py
diff options
context:
space:
mode:
authorStephen Gran <stephen.gran@guardian.co.uk>2013-11-27 15:40:47 +0000
committerStephen Gran <stephen.gran@guardian.co.uk>2013-11-27 22:08:28 +0000
commita028cbe46cb22b050af3f3131dde8655f6ebc852 (patch)
treef5173520b6e696c55626c59aae27e7b56c5cf6a6 /heat/engine/resources/neutron/loadbalancer.py
parent01fb048330f17a41dd8977df0bd612c853dc3df0 (diff)
downloadheat-a028cbe46cb22b050af3f3131dde8655f6ebc852.tar.gz
Ensure that members is a list
self.properties.get('members') should not be None. Ensure that an empty list is returned instead. Change-Id: I01d191eafebac30ad25505b312ff6e936181bdbf Closes-Bug: #1255697
Diffstat (limited to 'heat/engine/resources/neutron/loadbalancer.py')
-rw-r--r--heat/engine/resources/neutron/loadbalancer.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/heat/engine/resources/neutron/loadbalancer.py b/heat/engine/resources/neutron/loadbalancer.py
index eb810d835..d8920288f 100644
--- a/heat/engine/resources/neutron/loadbalancer.py
+++ b/heat/engine/resources/neutron/loadbalancer.py
@@ -320,6 +320,7 @@ class LoadBalancer(resource.Resource):
'running on the members.')},
'members': {
'Type': 'List',
+ 'Default': [],
'UpdateAllowed': True,
'Description': _('The list of Nova server IDs load balanced.')},
}
@@ -331,9 +332,8 @@ class LoadBalancer(resource.Resource):
client = self.neutron()
nova_client = self.nova()
protocol_port = self.properties['protocol_port']
- members = self.properties.get('members') or []
- for member in members:
+ for member in self.properties.get('members'):
address = nova_utils.server_to_ipaddress(nova_client, member)
lb_member = client.create_member({
'member': {
@@ -370,7 +370,7 @@ class LoadBalancer(resource.Resource):
def handle_delete(self):
client = self.neutron()
- for member in self.properties.get('members', []):
+ for member in self.properties.get('members'):
member_id = db_api.resource_data_get(self, member)
try:
client.delete_member(member_id)