Merge lp:~james-page/charm-helpers/bug-1413862-stable into lp:~openstack-charmers/charm-helpers/stable-1604

[James Page]

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-01-22 06:11:15 +0000
+++ charmhelpers/contrib/openstack/context.py	2015-03-02 12:15:12 +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:
 
=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2015-01-13 11:56:51 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2015-03-02 12:15:12 +0000
@@ -457,7 +457,7 @@
         self.config.side_effect = fake_config(SHARED_DB_CONFIG)
         shared_db = context.SharedDBContext()
         result = shared_db()
-        self.assertEquals(result, {})
+        self.assertEquals(result, None)
         self.relation_set.assert_called_with(
             relation_settings={
                 'hostname': '10.5.5.1'})