Merge lp:~hopem/charms/trusty/cinder-ceph/lp1493931-stable into lp:~openstack-charmers-archive/charms/precise/cinder-ceph/trunk

[Edward Hope-Morley]

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

charm_unit_test #9344 cinder-ceph for hopem mp271297
    UNIT OK: passed

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

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

charm_lint_check #10186 cinder-ceph for hopem mp271297
    LINT OK: passed

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

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

charm_amulet_test #6473 cinder-ceph for hopem mp271297
    AMULET OK: passed

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

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2015-08-10 16:34:26 +0000
+++ hooks/cinder_hooks.py	2015-09-16 13:00:05 +0000
@@ -117,7 +117,8 @@
         relation_set(
             relation_id=rel_id,
             backend_name=service_name(),
-            subordinate_configuration=json.dumps(CephSubordinateContext()())
+            subordinate_configuration=json.dumps(CephSubordinateContext()()),
+            stateless=True,
         )
 
 

=== modified file 'unit_tests/test_cinder_hooks.py'
--- unit_tests/test_cinder_hooks.py	2015-08-10 16:34:26 +0000
+++ unit_tests/test_cinder_hooks.py	2015-09-16 13:00:05 +0000
@@ -136,5 +136,6 @@
         self.relation_set.assert_called_with(
             relation_id=None,
             backend_name='test',
-            subordinate_configuration=json.dumps({'test': 1})
+            subordinate_configuration=json.dumps({'test': 1}),
+            stateless=True,
             )