Merge lp:~hopem/charms/trusty/keystone/fix-removed-peer-store-set-id-rels into lp:~openstack-charmers-archive/charms/trusty/keystone/next

[Edward Hope-Morley]

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

charm_lint_check #3182 keystone-next for hopem mp255634
    LINT OK: passed

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

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

charm_unit_test #2970 keystone-next for hopem mp255634
    UNIT OK: passed

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

[James Page (james-page)]

review: Approve

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

charm_amulet_test #2986 keystone-next for hopem mp255634
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

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

=== modified file 'hooks/keystone_utils.py'
--- hooks/keystone_utils.py	2015-03-30 20:42:39 +0000
+++ hooks/keystone_utils.py	2015-04-09 10:34:15 +0000
@@ -1471,12 +1471,11 @@
         relation_data['ca_cert'] = b64encode(ca_bundle)
         relation_data['https_keystone'] = 'True'
 
+    peer_store_and_set(relation_id=relation_id, **relation_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)
     relation_set(relation_id=relation_id, **filtered)
-    for rid in relation_ids('cluster'):
-        relation_set(relation_id=rid, **relation_data)
 
 
 def ensure_valid_service(service):

=== modified file 'unit_tests/test_keystone_utils.py'
--- unit_tests/test_keystone_utils.py	2015-03-30 20:42:39 +0000
+++ unit_tests/test_keystone_utils.py	2015-04-09 10:34:15 +0000
@@ -253,10 +253,11 @@
             else:
                 filtered[k] = v
 
-        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])
+        self.peer_store_and_set.assert_called_with(relation_id=relation_id,
+                                                   **relation_data)
+        self.relation_set.assert_called_with(relation_id=relation_id,
+                                             **filtered)
 
     @patch.object(utils, 'ensure_valid_service')
     @patch.object(utils, 'add_endpoint')