Merge lp:~gnuoy/charms/trusty/nova-cloud-controller/next-lp-1353135 into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Liam Young]

Do not attempt db migration if the db service has passed back a list of units who have been granted access and the executing unit is not on the list

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2014-07-31 15:34:23 +0000
+++ hooks/nova_cc_hooks.py	2014-08-28 14:35:57 +0000
@@ -15,6 +15,7 @@
     charm_dir,
     is_relation_made,
     log,
+    local_unit,
     ERROR,
     relation_get,
     relation_ids,
@@ -212,6 +213,13 @@
     CONFIGS.write_all()
 
     if eligible_leader(CLUSTER_RES):
+        # Bugs 1353135 & 1187508. Dbs can appear to be ready before the units
+        # acl entry has been added. So, if the db supports passing a list of
+        # permitted units then check if we're in the list.
+        allowed_units = relation_get('nova_allowed_units')
+        if allowed_units and local_unit() not in allowed_units.split():
+            log('Allowed_units list provided and this unit not present')
+            return
         migrate_database()
         log('Triggering remote cloud-compute restarts.')
         [compute_joined(rid=rid, remote_restart=True)
@@ -549,7 +557,7 @@
             )
             vip_group.append(vip_key)
 
-    if len(vip_group) > 1:
+    if len(vip_group) > 0:
         relation_set(groups={'grp_nova_vips': ' '.join(vip_group)})
 
     init_services = {

=== modified file 'unit_tests/test_nova_cc_hooks.py'
--- unit_tests/test_nova_cc_hooks.py	2014-07-29 14:42:08 +0000
+++ unit_tests/test_nova_cc_hooks.py	2014-08-28 14:35:57 +0000
@@ -34,6 +34,7 @@
     'determine_ports',
     'open_port',
     'is_relation_made',
+    'local_unit',
     'log',
     'relation_get',
     'relation_set',
@@ -323,6 +324,28 @@
         self.migrate_database.assert_called_with()
 
     @patch.object(hooks, 'CONFIGS')
+    def test_db_changed_allowed(self, configs):
+        allowed_units = 'nova-cloud-controller/0 nova-cloud-controller/3'
+        self.test_relation.set({
+            'nova_allowed_units': allowed_units,
+        })
+        self.local_unit.return_value = 'nova-cloud-controller/3'
+        self._shared_db_test(configs)
+        self.assertTrue(configs.write_all.called)
+        self.migrate_database.assert_called_with()
+
+    @patch.object(hooks, 'CONFIGS')
+    def test_db_changed_not_allowed(self, configs):
+        allowed_units = 'nova-cloud-controller/0 nova-cloud-controller/3'
+        self.test_relation.set({
+            'nova_allowed_units': allowed_units,
+        })
+        self.local_unit.return_value = 'nova-cloud-controller/1'
+        self._shared_db_test(configs)
+        self.assertTrue(configs.write_all.called)
+        self.assertFalse(self.migrate_database.called)
+
+    @patch.object(hooks, 'CONFIGS')
     def test_postgresql_db_changed(self, configs):
         self._postgresql_db_test(configs)
         self.assertTrue(configs.write_all.called)