Merge lp:~hopem/charms/trusty/keystone/stable-fix-db-ready-logic into lp:~openstack-charmers-archive/charms/trusty/keystone/trunk

[Edward Hope-Morley]

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

charm_lint_check #1502 keystone for hopem mp248243
    LINT OK: passed

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

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

charm_unit_test #1455 keystone for hopem mp248243
    UNIT OK: passed

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

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

charm_amulet_test #1619 keystone for hopem mp248243
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 124
  make: *** [test] Error 124

Full amulet test output: http://paste.ubuntu.com/10016252/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1619/

[Liam Young (gnuoy)]

Approve

review: Approve

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

charm_amulet_test #1621 keystone for hopem mp248243
    AMULET OK: passed

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

[Ryan Beisner (1chb1n)]

Re-triggered amulet test run due to suspected undercloud issue.

=== modified file 'hooks/keystone_utils.py'
--- hooks/keystone_utils.py	2015-01-28 16:54:56 +0000
+++ hooks/keystone_utils.py	2015-02-02 13:53:30 +0000
@@ -1408,9 +1408,8 @@
                     if allowed_units and local_unit() in allowed_units.split():
                         return True
 
-                    # If relation has units
-                    return False
+                    rel_has_units = True
 
-    # If neither relation has units then we are probably in sqllite mode return
-    # True.
+    # If neither relation has units then we are probably in sqlite mode so
+    # return True.
     return not rel_has_units

=== modified file 'unit_tests/test_keystone_utils.py'
--- unit_tests/test_keystone_utils.py	2015-01-27 22:21:37 +0000
+++ unit_tests/test_keystone_utils.py	2015-02-02 13:53:30 +0000
@@ -352,20 +352,28 @@
         self.assertEqual(utils.get_admin_passwd(), 'supersecretgen')
 
     def test_is_db_ready(self):
+        allowed_units = None
+
+        def fake_rel_get(attribute=None, *args, **kwargs):
+            if attribute == 'allowed_units':
+                return allowed_units
+
+        self.relation_get.side_effect = fake_rel_get
+
         self.relation_id.return_value = 'shared-db:0'
-        self.relation_ids.return_value = [self.relation_id.return_value]
+        self.relation_ids.return_value = ['shared-db:0']
         self.local_unit.return_value = 'unit/0'
-        self.relation_get.return_value = 'unit/0'
+        allowed_units = 'unit/0'
         self.assertTrue(utils.is_db_ready(use_current_context=True))
 
         self.relation_ids.return_value = ['acme:0']
         self.assertRaises(utils.is_db_ready, use_current_context=True)
 
         self.related_units.return_value = ['unit/0']
-        self.relation_ids.return_value = [self.relation_id.return_value]
+        self.relation_ids.return_value = ['shared-db:0', 'shared-db:1']
         self.assertTrue(utils.is_db_ready())
 
-        self.relation_get.return_value = 'unit/1'
+        allowed_units = 'unit/1'
         self.assertFalse(utils.is_db_ready())
 
         self.related_units.return_value = []