Merge lp:~hopem/charms/trusty/keystone/lp1476325 into lp:~openstack-charmers-archive/charms/trusty/keystone/next

[Edward Hope-Morley]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #6511 keystone-next for hopem mp265292
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/6511/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #6143 keystone-next for hopem mp265292
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/6143/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #5233 keystone-next for hopem mp265292
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5233/

[Billy Olsen (billy-olsen)]

Tested fine and looks good to me. Only request is for a unit test, otherwise I'm +1.

review: Needs Fixing

[lp:~hopem/charms/trusty/keystone/lp1476325]

165. By Edward Hope-Morley on 2015-09-16

synced /next

166. By Edward Hope-Morley on 2015-09-16

added unit test, fixed logic

Unmerged revisions

=== modified file 'hooks/keystone_hooks.py'
--- hooks/keystone_hooks.py	2015-07-22 10:39:31 +0000
+++ hooks/keystone_hooks.py	2015-09-16 01:22:43 +0000
@@ -499,6 +499,13 @@
 
         if iface is not None:
             vip_key = 'res_ks_{}_vip'.format(iface)
+            if vip_key in vip_group:
+                log("Resource '%s' (vip='%s') already exists in "
+                    "vip group - skipping" % (vip_key, vip),
+                    WARNING)
+                continue
+
+            vip_group.append(vip_key)
             resources[vip_key] = res_ks_vip
             resource_params[vip_key] = (
                 'params {ip}="{vip}" cidr_netmask="{netmask}"'
@@ -507,7 +514,6 @@
                                         iface=iface,
                                         netmask=netmask)
             )
-            vip_group.append(vip_key)
 
     if len(vip_group) >= 1:
         relation_set(relation_id=relation_id,

=== modified file 'unit_tests/test_keystone_hooks.py'
--- unit_tests/test_keystone_hooks.py	2015-08-14 16:10:45 +0000
+++ unit_tests/test_keystone_hooks.py	2015-09-16 01:22:43 +0000
@@ -657,6 +657,30 @@
         }
         self.relation_set.assert_called_with(**args)
 
+    def test_ha_joined_duplicate_vip_key(self):
+        self.get_hacluster_config.return_value = {
+            'vip': '10.10.10.10 10.10.10.11',
+            'ha-bindiface': 'em0',
+            'ha-mcastport': '8080'
+        }
+        self.get_iface_for_address.return_value = 'em1'
+        self.get_netmask_for_address.return_value = '255.255.255.0'
+        hooks.ha_joined()
+        args = {
+            'relation_id': None,
+            'corosync_bindiface': 'em0',
+            'corosync_mcastport': '8080',
+            'init_services': {'res_ks_haproxy': 'haproxy'},
+            'resources': {'res_ks_em1_vip': 'ocf:heartbeat:IPaddr2',
+                          'res_ks_haproxy': 'lsb:haproxy'},
+            'resource_params': {
+                'res_ks_em1_vip': 'params ip="10.10.10.10"'
+                                  ' cidr_netmask="255.255.255.0" nic="em1"',
+                'res_ks_haproxy': 'op monitor interval="5s"'},
+            'clones': {'cl_ks_haproxy': 'res_ks_haproxy'}
+        }
+        self.relation_set.assert_called_with(**args)
+
     def test_ha_joined_no_bound_ip(self):
         self.get_hacluster_config.return_value = {
             'vip': '10.10.10.10',