openstack
/
charm-interface-hacluster
Code Issues Proposed changes

Ensure only VIP resources are in vip group 

Fix bug I intrduces in:
77c2b25407
Where the haproxy resource was also added to vip group.

Ensure only VIP resources are added to the vip group.

Change-Id: Ie6b4ae89af74151ebb435c72a6df78174bbec87b
This commit is contained in:
David Ames 2017-08-21 14:48:32 -07:00
parent 77c2b25407
commit c01416b7eb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
requires.py
View File

@ -106,10 +106,14 @@ class HAClusterRequires(RelationBase):
# Vip Group
group = 'grp_{}_vips'.format(name)
vip_res_group_members = []
if resource_dict:
vip_resources = resource_dict.get('resources')
if vip_resources:
resources.group(group, *vip_resources.keys())
for vip_res in vip_resources:
if 'vip' in vip_res:
vip_res_group_members.append(vip_res)
resources.group(group, *vip_res_group_members)
self.set_local(resources=resources)