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

[Edward Hope-Morley]

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #932 cinder-next for hopem mp241084
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value

Full lint test output: http://paste.ubuntu.com/8868314/
Build: http://10.98.191.181:8080/job/charm_lint_check/932/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #767 cinder-next for hopem mp241084
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/cinder_hooks 204 13 94% 99-100, 115, 122, 269-274, 279-280, 299-300
  hooks/cinder_utils 169 14 92% 186, 398-403, 440-452
  TOTAL 425 33 92%
  Ran 84 tests in 5.409s
  OK

Full unit test output: http://paste.ubuntu.com/8868316/
Build: http://10.98.191.181:8080/job/charm_unit_test/767/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #350 cinder-next for hopem mp241084
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv05"
  WARNING cannot delete security group "juju-osci-sv05-0". Used by another environment?
  juju-test INFO : Results: 2 passed, 1 failed, 0 errored
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/8868565/
Build: http://10.98.191.181:8080/job/charm_amulet_test/350/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #933 cinder-next for hopem mp241084
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value

Full lint test output: http://paste.ubuntu.com/8868686/
Build: http://10.98.191.181:8080/job/charm_lint_check/933/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #768 cinder-next for hopem mp241084
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/cinder_hooks 204 13 94% 99-100, 115, 122, 269-274, 279-280, 299-300
  hooks/cinder_utils 169 14 92% 186, 398-403, 440-452
  TOTAL 425 33 92%
  Ran 84 tests in 5.462s
  OK

Full unit test output: http://paste.ubuntu.com/8868688/
Build: http://10.98.191.181:8080/job/charm_unit_test/768/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #351 cinder-next for hopem mp241084
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor.15-basic-trusty-icehouse RESULT :
  juju-test.conductor DEBUG : Tearing down osci-sv07 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet test output: http://paste.ubuntu.com/8868852/
Build: http://10.98.191.181:8080/job/charm_amulet_test/351/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #934 cinder-next for hopem mp241084
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value

Full lint test output: http://paste.ubuntu.com/8870110/
Build: http://10.98.191.181:8080/job/charm_lint_check/934/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #769 cinder-next for hopem mp241084
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  hooks/cinder_utils 169 14 92% 186, 398-403, 440-452
  TOTAL 427 37 91%
  Ran 84 tests in 5.261s
  FAILED (failures=1)
  make: *** [unit_test] Error 1

Full unit test output: http://paste.ubuntu.com/8870111/
Build: http://10.98.191.181:8080/job/charm_unit_test/769/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #352 cinder-next for hopem mp241084
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 2 passed, 1 failed, 0 errored
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/8870403/
Build: http://10.98.191.181:8080/job/charm_amulet_test/352/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #973 cinder-next for hopem mp241084
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value

Full lint test output: http://paste.ubuntu.com/8903852/
Build: http://10.98.191.181:8080/job/charm_lint_check/973/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #808 cinder-next for hopem mp241084
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/cinder_hooks 208 6 97% 104-105, 120, 127, 311-312
  hooks/cinder_utils 169 14 92% 186, 398-403, 440-452
  TOTAL 429 26 94%
  Ran 86 tests in 5.534s
  OK

Full unit test output: http://paste.ubuntu.com/8903855/
Build: http://10.98.191.181:8080/job/charm_unit_test/808/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #354 cinder-next for hopem mp241084
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv05"
  WARNING cannot delete security group "juju-osci-sv05-0". Used by another environment?
  juju-test INFO : Results: 1 passed, 2 failed, 0 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

Full amulet test output: http://paste.ubuntu.com/8904109/
Build: http://10.98.191.181:8080/job/charm_amulet_test/354/

[lp:~hopem/charms/trusty/cinder/ceph-broker]

63. By Edward Hope-Morley on 2014-11-19

added ceph broker wrappers

64. By Edward Hope-Morley on 2014-11-19

added broker wrappers

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

UOSCI bot says:
charm_lint_check #1136 cinder-next for hopem mp241084
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value

Full lint test output: http://paste.ubuntu.com/9107805/
Build: http://10.98.191.181:8080/job/charm_lint_check/1136/

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

UOSCI bot says:
charm_unit_test #970 cinder-next for hopem mp241084
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/cinder_hooks 209 6 97% 107-108, 123, 130, 316-317
  hooks/cinder_utils 169 14 92% 186, 398-403, 440-452
  TOTAL 430 26 94%
  Ran 86 tests in 7.411s
  OK

Full unit test output: http://paste.ubuntu.com/9107808/
Build: http://10.98.191.181:8080/job/charm_unit_test/970/

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

UOSCI bot says:
charm_amulet_test #478 cinder-next for hopem mp241084
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  subprocess.CalledProcessError: Command '['juju-deployer', '-W', '-L', '-c', '/tmp/amulet-juju-deployer-oTOPfc.json', '-e', 'osci-sv07', '-t', '1000', 'osci-sv07']' returned non-zero exit status 1
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 1 passed, 2 failed, 0 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

Full amulet test output: http://paste.ubuntu.com/9108356/
Build: http://10.98.191.181:8080/job/charm_amulet_test/478/

[lp:~hopem/charms/trusty/cinder/ceph-broker]

65. By Edward Hope-Morley on 2014-11-20

don't stop/start cinder-volume on broker op

66. By Edward Hope-Morley on 2014-11-20

don't stop/start cinder-volume on broker op

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

UOSCI bot says:
charm_lint_check #1163 cinder-next for hopem mp241084
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value

Full lint test output: http://paste.ubuntu.com/9133387/
Build: http://10.98.191.181:8080/job/charm_lint_check/1163/

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

UOSCI bot says:
charm_unit_test #997 cinder-next for hopem mp241084
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/cinder_hooks 205 6 97% 105-106, 121, 128, 309-310
  hooks/cinder_utils 169 14 92% 186, 398-403, 440-452
  TOTAL 426 26 94%
  Ran 86 tests in 5.420s
  OK

Full unit test output: http://paste.ubuntu.com/9133390/
Build: http://10.98.191.181:8080/job/charm_unit_test/997/

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

UOSCI bot says:
charm_amulet_test #505 cinder-next for hopem mp241084
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  WARNING cannot delete security group "juju-osci-sv07". Used by another environment?
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 0 passed, 1 failed, 2 errored
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/9133990/
Build: http://10.98.191.181:8080/job/charm_amulet_test/505/

[James Page (james-page)]

review: Needs Resubmitting

[lp:~hopem/charms/trusty/cinder/ceph-broker]

67. By Edward Hope-Morley on 2014-12-15

synced /next

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

charm_unit_test #191 cinder-next for hopem mp241084
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
  FAILED (errors=2, failures=8)
  make: *** [unit_test] Error 1

Full unit test output: http://paste.ubuntu.com/9527068/
Build: http://10.245.162.77:8080/job/charm_unit_test/191/

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

charm_lint_check #157 cinder-next for hopem mp241084
    LINT OK: passed

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

[lp:~hopem/charms/trusty/cinder/ceph-broker]

68. By Edward Hope-Morley on 2014-12-15

synced ch

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

charm_amulet_test #171 cinder-next for hopem mp241084
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

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

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

charm_lint_check #168 cinder-next for hopem mp241084
    LINT OK: passed

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

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

charm_unit_test #202 cinder-next for hopem mp241084
    UNIT OK: passed

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

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

charm_amulet_test #182 cinder-next for hopem mp241084
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 124
  make: *** [test] Error 124

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

=== modified file 'hooks/charmhelpers/contrib/storage/linux/ceph.py'
--- hooks/charmhelpers/contrib/storage/linux/ceph.py	2014-12-15 09:57:32 +0000
+++ hooks/charmhelpers/contrib/storage/linux/ceph.py	2014-12-15 10:42:12 +0000
@@ -372,3 +372,46 @@
             return None
     else:
         return None
+
+
+class CephBrokerRq(object):
+    """Ceph broker request.
+
+    Multiple operations can be added to a request and sent to the Ceph broker
+    to be executed.
+
+    Request is json-encoded for sending over the wire.
+
+    The API is versioned and defaults to version 1.
+    """
+    def __init__(self, api_version=1):
+        self.api_version = api_version
+        self.ops = []
+
+    def add_op_create_pool(self, name, replica_count=3):
+        self.ops.append({'op': 'create-pool', 'name': name,
+                         'replicas': replica_count})
+
+    @property
+    def request(self):
+        return json.dumps({'api-version': self.api_version, 'ops': self.ops})
+
+
+class CephBrokerRsp(object):
+    """Ceph broker response.
+
+    Response is json-decoded and contents provided as methods/properties.
+
+    The API is versioned and defaults to version 1.
+    """
+    def __init__(self, encoded_rsp):
+        self.api_version = None
+        self.rsp = json.loads(encoded_rsp)
+
+    @property
+    def exit_code(self):
+        return self.rsp.get('exit-code')
+
+    @property
+    def exit_msg(self):
+        return self.rsp.get('stderr')

=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2014-10-09 19:51:49 +0000
+++ hooks/cinder_hooks.py	2014-12-15 10:42:12 +0000
@@ -1,5 +1,4 @@
 #!/usr/bin/python
-
 import os
 import sys
 import uuid
@@ -9,7 +8,6 @@
 from cinder_utils import (
     determine_packages,
     do_openstack_upgrade,
-    ensure_ceph_pool,
     juju_log,
     migrate_database,
     configure_lvm_storage,
@@ -37,6 +35,7 @@
     unit_get,
     log,
     ERROR,
+    INFO
 )
 
 from charmhelpers.fetch import (
@@ -44,14 +43,21 @@
     apt_update
 )
 
-from charmhelpers.core.host import lsb_release, restart_on_change
+from charmhelpers.core.host import (
+    lsb_release,
+    restart_on_change,
+)
 
 from charmhelpers.contrib.openstack.utils import (
     configure_installation_source,
     openstack_upgrade_available,
     sync_db_with_multi_ipv6_addresses)
 
-from charmhelpers.contrib.storage.linux.ceph import ensure_ceph_keyring
+from charmhelpers.contrib.storage.linux.ceph import (
+    ensure_ceph_keyring,
+    CephBrokerRq,
+    CephBrokerRsp,
+)
 
 from charmhelpers.contrib.hahelpers.cluster import (
     eligible_leader,
@@ -254,23 +260,38 @@
 
 @hooks.hook('ceph-relation-changed')
 @restart_on_change(restart_map())
-def ceph_changed():
+def ceph_changed(relation_id=None):
     if 'ceph' not in CONFIGS.complete_contexts():
         juju_log('ceph relation incomplete. Peer not ready?')
         return
-    svc = service_name()
-    if not ensure_ceph_keyring(service=svc,
+
+    service = service_name()
+    if not ensure_ceph_keyring(service=service,
                                user='cinder', group='cinder'):
         juju_log('Could not create ceph keyring: peer not ready?')
         return
-    CONFIGS.write(CINDER_CONF)
-    CONFIGS.write(ceph_config_file())
-    set_ceph_env_variables(service=svc)
-
-    if eligible_leader(CLUSTER_RES):
-        _config = config()
-        ensure_ceph_pool(service=svc,
-                         replicas=_config['ceph-osd-replication-count'])
+
+    settings = relation_get(rid=relation_id)
+    if settings and 'broker_rsp' in settings:
+        rsp = CephBrokerRsp(settings['broker_rsp'])
+        # Non-zero return code implies failure
+        if rsp.exit_code:
+            log("Ceph broker request failed (rc=%s, msg=%s)" %
+                (rsp.exit_code, rsp.exit_msg), level=ERROR)
+            return
+
+        log("Ceph broker request succeeded (rc=%s, msg=%s)" %
+            (rsp.exit_code, rsp.exit_msg), level=INFO)
+        set_ceph_env_variables(service=service)
+        CONFIGS.write(CINDER_CONF)
+        CONFIGS.write(ceph_config_file())
+    else:
+        rq = CephBrokerRq()
+        replicas = config('ceph-osd-replication-count')
+        rq.add_op_create_pool(name=service, replica_count=replicas)
+        for rid in relation_ids('ceph'):
+            relation_set(relation_id=rid, broker_req=rq.request)
+            log("Request(s) sent to Ceph broker (rid=%s)" % (rid))
 
 
 @hooks.hook('cluster-relation-joined')

=== modified file 'hooks/cinder_utils.py'
--- hooks/cinder_utils.py	2014-12-15 09:57:32 +0000
+++ hooks/cinder_utils.py	2014-12-15 10:42:12 +0000
@@ -27,11 +27,6 @@
     lsb_release
 )
 
-from charmhelpers.contrib.storage.linux.ceph import (
-    create_pool as ceph_create_pool,
-    pool_exists as ceph_pool_exists,
-)
-
 from charmhelpers.contrib.openstack.alternatives import install_alternative
 from charmhelpers.contrib.hahelpers.cluster import (
     eligible_leader,
@@ -411,13 +406,6 @@
     subprocess.check_call(cmd)
 
 
-def ensure_ceph_pool(service, replicas):
-    'Creates a ceph pool for service if one does not exist'
-    # TODO(Ditto about moving somewhere sharable)
-    if not ceph_pool_exists(service=service, name=service):
-        ceph_create_pool(service=service, name=service, replicas=replicas)
-
-
 def set_ceph_env_variables(service):
     # XXX: Horrid kludge to make cinder-volume use
     # a different ceph username than admin

=== modified file 'unit_tests/test_cinder_hooks.py'
--- unit_tests/test_cinder_hooks.py	2014-10-14 15:59:34 +0000
+++ unit_tests/test_cinder_hooks.py	2014-12-15 10:42:12 +0000
@@ -1,10 +1,14 @@
-from mock import MagicMock, patch, call
+import json
+from mock import (
+    MagicMock,
+    patch,
+    call
+)
 
 import cinder_utils as utils
-
 from test_utils import (
     CharmTestCase,
-    RESTART_MAP,
+    RESTART_MAP
 )
 
 # Need to do some early patching to get the module loaded.
@@ -31,7 +35,6 @@
     'determine_packages',
     'do_openstack_upgrade',
     'ensure_ceph_keyring',
-    'ensure_ceph_pool',
     'juju_log',
     'log',
     'lsb_release',
@@ -362,22 +365,64 @@
         m = 'ceph relation incomplete. Peer not ready?'
         self.juju_log.assert_called_with(m)
 
-    def test_ceph_changed(self):
+    @patch("cinder_hooks.relation_set")
+    @patch("cinder_hooks.relation_get")
+    def test_ceph_changed_broker_send_rq(self, mock_relation_get,
+                                         mock_relation_set):
+        self.CONFIGS.complete_contexts.return_value = ['ceph']
+        self.service_name.return_value = 'cinder'
+        self.ensure_ceph_keyring.return_value = True
+        self.ceph_config_file.return_value = '/var/lib/charm/cinder/ceph.conf'
+        self.relation_ids.return_value = ['ceph:0']
+        hooks.hooks.execute(['hooks/ceph-relation-changed'])
+        self.ensure_ceph_keyring.assert_called_with(service='cinder',
+                                                    user='cinder',
+                                                    group='cinder')
+        req = {'api-version': 1,
+               'ops': [{"op": "create-pool", "name": "cinder", "replicas": 3}]}
+        broker_dict = json.dumps(req)
+        mock_relation_set.assert_called_with(broker_req=broker_dict,
+                                             relation_id='ceph:0')
+        for c in [call('/var/lib/charm/cinder/ceph.conf'),
+                  call('/etc/cinder/cinder.conf')]:
+            self.assertNotIn(c, self.CONFIGS.write.call_args_list)
+        self.assertFalse(self.set_ceph_env_variables.called)
+
+    @patch("cinder_hooks.relation_get", autospec=True)
+    def test_ceph_changed_broker_success(self, mock_relation_get):
         'It ensures ceph assets created on ceph changed'
         self.CONFIGS.complete_contexts.return_value = ['ceph']
         self.service_name.return_value = 'cinder'
         self.ensure_ceph_keyring.return_value = True
         self.ceph_config_file.return_value = '/var/lib/charm/cinder/ceph.conf'
+        mock_relation_get.return_value = {'broker_rsp':
+                                          json.dumps({'exit-code': 0})}
         hooks.hooks.execute(['hooks/ceph-relation-changed'])
         self.ensure_ceph_keyring.assert_called_with(service='cinder',
                                                     user='cinder',
                                                     group='cinder')
-        self.ensure_ceph_pool.assert_called_with(service='cinder', replicas=3)
         for c in [call('/var/lib/charm/cinder/ceph.conf'),
                   call('/etc/cinder/cinder.conf')]:
             self.assertIn(c, self.CONFIGS.write.call_args_list)
         self.set_ceph_env_variables.assert_called_with(service='cinder')
 
+    @patch("cinder_hooks.relation_get", autospec=True)
+    def test_ceph_changed_broker_nonzero_rc(self, mock_relation_get):
+        self.CONFIGS.complete_contexts.return_value = ['ceph']
+        self.service_name.return_value = 'cinder'
+        self.ensure_ceph_keyring.return_value = True
+        self.ceph_config_file.return_value = '/var/lib/charm/cinder/ceph.conf'
+        mock_relation_get.return_value = {'broker_rsp':
+                                          json.dumps({'exit-code': 1})}
+        hooks.hooks.execute(['hooks/ceph-relation-changed'])
+        self.ensure_ceph_keyring.assert_called_with(service='cinder',
+                                                    user='cinder',
+                                                    group='cinder')
+        for c in [call('/var/lib/charm/cinder/ceph.conf'),
+                  call('/etc/cinder/cinder.conf')]:
+            self.assertNotIn(c, self.CONFIGS.write.call_args_list)
+        self.assertFalse(self.set_ceph_env_variables.called)
+
     def test_ceph_changed_no_keys(self):
         'It ensures ceph assets created on ceph changed'
         self.CONFIGS.complete_contexts.return_value = ['ceph']
@@ -395,7 +440,6 @@
         self.service_name.return_value = 'cinder'
         self.ensure_ceph_keyring.return_value = True
         hooks.hooks.execute(['hooks/ceph-relation-changed'])
-        self.assertFalse(self.ensure_ceph_pool.called)
 
 
 class TestDepartedHooks(CharmTestCase):

=== modified file 'unit_tests/test_cinder_utils.py'
--- unit_tests/test_cinder_utils.py	2014-11-29 14:58:42 +0000
+++ unit_tests/test_cinder_utils.py	2014-12-15 10:42:12 +0000
@@ -19,8 +19,6 @@
     'umount',
     'mkdir',
     # ceph utils
-    'ceph_create_pool',
-    'ceph_pool_exists',
     # storage_utils
     'create_lvm_physical_volume',
     'create_lvm_volume_group',
@@ -401,18 +399,6 @@
             cinder_utils.migrate_database()
             check_call.assert_called_with(['cinder-manage', 'db', 'sync'])
 
-    def test_ensure_ceph_pool(self):
-        self.ceph_pool_exists.return_value = False
-        cinder_utils.ensure_ceph_pool(service='cinder', replicas=3)
-        self.ceph_create_pool.assert_called_with(service='cinder',
-                                                 name='cinder',
-                                                 replicas=3)
-
-    def test_ensure_ceph_pool_already_exists(self):
-        self.ceph_pool_exists.return_value = True
-        cinder_utils.ensure_ceph_pool(service='cinder', replicas=3)
-        self.assertFalse(self.ceph_create_pool.called)
-
     @patch('os.path.exists')
     def test_register_configs_apache(self, exists):
         exists.return_value = False

=== modified file 'unit_tests/test_cluster_hooks.py'
--- unit_tests/test_cluster_hooks.py	2014-10-01 22:07:44 +0000
+++ unit_tests/test_cluster_hooks.py	2014-12-15 10:42:12 +0000
@@ -26,8 +26,6 @@
 TO_PATCH = [
     # cinder_utils
     'determine_packages',
-    'ensure_ceph_keyring',
-    'ensure_ceph_pool',
     'juju_log',
     'lsb_release',
     'migrate_database',