From c01416b7eb084cc5923959d9d4e8d3d6064483de Mon Sep 17 00:00:00 2001
From: David Ames <david.ames@canonical.com>
Date: Mon, 21 Aug 2017 14:48:32 -0700
Subject: [PATCH] Ensure only VIP resources are in vip group

Fix bug I intrduces in:
https://github.com/openstack/charm-interface-hacluster/commit/77c2b2540777674b6dfb8d7e924a1125b264debe
Where the haproxy resource was also added to vip group.

Ensure only VIP resources are added to the vip group.

Change-Id: Ie6b4ae89af74151ebb435c72a6df78174bbec87b
---
 requires.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/requires.py b/requires.py
index ad3346e..6cd30d1 100644
--- a/requires.py
+++ b/requires.py
@@ -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)