summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-03-01 22:20:03 +0000
committerGerrit Code Review <review@openstack.org>2014-03-01 22:20:03 +0000
commit6c99dc46c5d4ebe91c6da49ace286025e55b9a2d (patch)
treeeaae950b9fcbf935e6446b68bfb3b63a92e55566
parentdefcf235c158e93938c93f556383939515852c88 (diff)
parenta440ccb5c74be3d92ca1aeb7507239f341b3633f (diff)
downloadheat-6c99dc46c5d4ebe91c6da49ace286025e55b9a2d.tar.gz
Merge "Fix "members" property check" into stable/havana
-rw-r--r--heat/engine/resources/neutron/loadbalancer.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/heat/engine/resources/neutron/loadbalancer.py b/heat/engine/resources/neutron/loadbalancer.py
index e814ee7b3..345fed9f1 100644
--- a/heat/engine/resources/neutron/loadbalancer.py
+++ b/heat/engine/resources/neutron/loadbalancer.py
@@ -325,7 +325,7 @@ class LoadBalancer(resource.Resource):
client = self.neutron()
nova_client = self.nova()
protocol_port = self.properties['protocol_port']
- for member in self.t['Properties'].get('members', []):
+ for member in self.properties.get('members', []):
address = nova_utils.server_to_ipaddress(nova_client, member)
lb_member = client.create_member({
'member': {
@@ -361,7 +361,7 @@ class LoadBalancer(resource.Resource):
def handle_delete(self):
client = self.neutron()
- for member in self.t['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)