Merge lp:~james-page/charms/trusty/keystone/stable-bug-1413862 into lp:~openstack-charmers-archive/charms/trusty/keystone/trunk

[James Page]

Resync helpers to resolve race condition when access-network is set in mysql or percona-cluster charms

Resync helpers to resolve race condition when access-network is set in mysql or percona-cluster charms

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

charm_lint_check #2477 keystone for james-page mp251900
    LINT OK: passed

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

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

charm_unit_test #2267 keystone for james-page mp251900
    UNIT OK: passed

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

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

charm_amulet_test #2350 keystone for james-page mp251900
    AMULET OK: passed

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

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	2015-01-13 14:40:50 +0000
+++ charm-helpers-hooks.yaml	2015-03-05 11:16:20 +0000
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 destination: hooks/charmhelpers
 include:
     - core

=== modified file 'charm-helpers-tests.yaml'
--- charm-helpers-tests.yaml	2014-09-23 10:21:28 +0000
+++ charm-helpers-tests.yaml	2015-03-05 11:16:20 +0000
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 destination: tests/charmhelpers
 include:
     - contrib.amulet

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-01-26 09:44:47 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-03-05 11:16:20 +0000
@@ -191,7 +191,7 @@
                                         unit=local_unit())
             if set_hostname != access_hostname:
                 relation_set(relation_settings={hostname_key: access_hostname})
-                return ctxt  # Defer any further hook execution for now....
+                return None  # Defer any further hook execution for now....
 
         password_setting = 'password'
         if self.relation_prefix: