Merge lp:~hopem/charms/trusty/ceph/lp1548478 into lp:~openstack-charmers-archive/charms/trusty/ceph/next

[Edward Hope-Morley]

This needs to land first - https://code.launchpad.net/~hopem/charms/trusty/nova-compute/lp1548478/+merge/286833

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

charm_lint_check #1175 ceph-next for hopem mp286836
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1175/

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

charm_unit_test #1012 ceph-next for hopem mp286836
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1012/

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

charm_amulet_test #460 ceph-next for hopem mp286836
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/460/

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2016-02-18 11:02:17 +0000
+++ tests/basic_deployment.py	2016-02-22 20:24:55 +0000
@@ -391,7 +391,6 @@
         conf = '/etc/nova/nova.conf'
         expected = {
             'libvirt': {
-                'rbd_pool': 'nova',
                 'rbd_user': 'nova-compute',
                 'rbd_secret_uuid': u.not_null
             }