Merge next branch

hooks/charmhelpers/contrib/openstack/templates/git.upstart

@@ -9,7 +9,5 @@ respawn
 exec start-stop-daemon --start --chuid {{ user_name }} \
             --chdir {{ start_dir }} --name {{ process_name }} \
             --exec {{ executable_name }} -- \
-            {% for config_file in config_files -%}
             --config-file={{ config_file }} \
-            {% endfor -%}
             --log-file={{ log_file }}

hooks/keystone_utils.py

@@ -1501,12 +1501,11 @@ def add_service_to_keystone(relation_id=None, remote_unit=None):
         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):

unit_tests/test_keystone_utils.py

@@ -273,10 +273,11 @@ class TestKeystoneUtils(CharmTestCase):
             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')