Merge lp:~james-page/charms/trusty/cinder/fixup-allowed-unit-migration into lp:~openstack-charmers-archive/charms/trusty/cinder/next

[James Page]

[Adam Collard (adam-collard)]

2 minor comments inline

review: Approve

[lp:~james-page/charms/trusty/cinder/fixup-allowed-unit-migration]

90. By James Page on 2015-04-21

Fixup based on feedback

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

charm_lint_check #3687 cinder-next for james-page mp256953
    LINT OK: passed

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

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

charm_unit_test #3474 cinder-next for james-page mp256953
    UNIT OK: passed

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

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

charm_amulet_test #3482 cinder-next for james-page mp256953
    AMULET OK: passed

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

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2015-04-02 12:13:45 +0000
+++ hooks/cinder_hooks.py	2015-04-21 15:20:32 +0000
@@ -195,11 +195,12 @@
         # 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('allowed_units')
-        if allowed_units and local_unit() not in allowed_units.split():
-            juju_log('Allowed_units list provided and this unit not present')
-            return
-        juju_log('Cluster leader, performing db sync')
-        migrate_database()
+        if allowed_units and local_unit() in allowed_units.split():
+            juju_log('Cluster leader, performing db sync')
+            migrate_database()
+        else:
+            juju_log('allowed_units either not presented, or local unit '
+                     'not in acl list: %s' % repr(allowed_units))
 
 
 @hooks.hook('pgsql-db-relation-changed')

=== modified file 'unit_tests/test_cinder_hooks.py'
--- unit_tests/test_cinder_hooks.py	2015-04-02 12:13:45 +0000
+++ unit_tests/test_cinder_hooks.py	2015-04-21 15:20:32 +0000
@@ -244,6 +244,15 @@
         hooks.hooks.execute(['hooks/shared-db-relation-changed'])
         self.assertFalse(self.migrate_database.called)
 
+    def test_db_changed_relation_db_missing_acls(self):
+        'No database migration is attempted when ACL list is not present'
+        self.relation_get.return_value = None
+        self.local_unit.return_value = 'cinder/0'
+        self.CONFIGS.complete_contexts.return_value = ['shared-db']
+        self.eligible_leader.return_value = True
+        hooks.hooks.execute(['hooks/shared-db-relation-changed'])
+        self.assertFalse(self.migrate_database.called)
+
     def test_pgsql_db_changed_relation_incomplete(self):
         'It does not write out cinder.conf with incomplete pgsql-db rel'
         hooks.hooks.execute(['hooks/pgsql-db-relation-changed'])