Merge lp:~hopem/charms/trusty/keystone/fix-auth-settings into lp:~openstack-charmers-archive/charms/trusty/keystone/next

[Edward Hope-Morley]

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

charm_lint_check #2967 keystone-next for hopem mp254520
    LINT OK: passed

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

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

charm_unit_test #2758 keystone-next for hopem mp254520
    UNIT OK: passed

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

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/keystone_utils.py'
--- hooks/keystone_utils.py	2015-03-27 00:27:22 +0000
+++ hooks/keystone_utils.py	2015-03-29 23:11:23 +0000
@@ -1247,12 +1247,9 @@
             # Some backend services advertise no endpoint but require a
             # hook execution to update auth strategy.
             relation_data = {}
-            rel_only_data = {}
             # Check if clustered and use vip + haproxy ports if so
-            # NOTE(hopem): don't put these on peer relation because racey
-            #              leader election causes cluster relation to spin)
-            rel_only_data["auth_host"] = resolve_address(ADMIN)
-            rel_only_data["service_host"] = resolve_address(PUBLIC)
+            relation_data["auth_host"] = resolve_address(ADMIN)
+            relation_data["service_host"] = resolve_address(PUBLIC)
 
             relation_data["auth_protocol"] = protocol
             relation_data["service_protocol"] = protocol
@@ -1276,7 +1273,6 @@
                 log("Creating requested role: %s" % role)
                 create_role(role)
 
-            relation_set(relation_id=relation_id, **rel_only_data)
             peer_store_and_set(relation_id=relation_id, **relation_data)
             return
         else:
@@ -1381,14 +1377,11 @@
     # service credentials
     service_tenant = config('service-tenant')
 
-    # NOTE(hopem): don't put these on peer relation because racey
-    #              leader election causes cluster relation to spin)
-    rel_only_data = {"auth_host": resolve_address(ADMIN),
-                     "service_host": resolve_address(PUBLIC)}
-
     # NOTE(dosaboy): we use __null__ to represent settings that are to be
     # routed to relations via the cluster relation and set to None.
     relation_data = {
+        "auth_host": resolve_address(ADMIN),
+        "service_host": resolve_address(PUBLIC),
         "admin_token": token,
         "service_port": config("service-port"),
         "auth_port": config("admin-port"),
@@ -1423,7 +1416,6 @@
         relation_data['ca_cert'] = b64encode(ca_bundle)
         relation_data['https_keystone'] = 'True'
 
-    relation_set(relation_id=relation_id, **rel_only_data)
     # NOTE(dosaboy): '__null__' settings are for peer relation only so that
     # settings can flushed so we filter them out for non-peer relation.
     filtered = filter_null(relation_data)

=== modified file 'unit_tests/test_keystone_utils.py'
--- unit_tests/test_keystone_utils.py	2015-03-26 23:13:15 +0000
+++ unit_tests/test_keystone_utils.py	2015-03-29 23:11:23 +0000
@@ -179,17 +179,15 @@
         self.assertTrue(self.https.called)
         self.assertTrue(self.create_role.called)
 
-        rel_only_data = {'auth_host': '10.10.10.10',
-                         'service_host': '10.10.10.10'}
-        relation_data = {'auth_protocol': 'https',
+        relation_data = {'auth_host': '10.10.10.10',
+                         'service_host': '10.10.10.10',
+                         'auth_protocol': 'https',
                          'service_protocol': 'https',
                          'auth_port': 80,
                          'service_port': 81,
                          'https_keystone': 'True',
                          'ca_cert': 'certificate',
                          'region': 'RegionOne'}
-        self.relation_set.assert_called_with(relation_id=relation_id,
-                                             **rel_only_data)
         self.peer_store_and_set.assert_called_with(relation_id=relation_id,
                                                    **relation_data)
 
@@ -237,9 +235,8 @@
         self.grant_role.assert_called_with('keystone', 'admin', 'tenant')
         self.create_role.assert_called_with('role1', 'keystone', 'tenant')
 
-        rel_only_data = {'auth_host': '10.0.0.3',
-                         'service_host': '10.0.0.3'}
-        relation_data = {'admin_token': 'token', 'service_port': 81,
+        relation_data = {'auth_host': '10.0.0.3', 'service_host': '10.0.0.3',
+                         'admin_token': 'token', 'service_port': 81,
                          'auth_port': 80, 'service_username': 'keystone',
                          'service_password': 'password',
                          'service_tenant': 'tenant',
@@ -256,11 +253,10 @@
             else:
                 filtered[k] = v
 
-        call1 = call(relation_id=relation_id, **rel_only_data)
-        call2 = call(relation_id=relation_id, **filtered)
-        call3 = call(relation_id='cluster/0', **relation_data)
+        call1 = call(relation_id=relation_id, **filtered)
+        call2 = call(relation_id='cluster/0', **relation_data)
         self.assertTrue(self.relation_set.called)
-        self.relation_set.assert_has_calls([call1, call2, call3])
+        self.relation_set.assert_has_calls([call1, call2])
 
     @patch.object(utils, 'ensure_valid_service')
     @patch.object(utils, 'add_endpoint')