openstack/charm-cinder
Code Issues Proposed changes

[hopem,r=]

Browse Source 
Implemeted Ceph broker support for ceph-client
relation.
This commit is contained in:
Edward Hope-Morley
2014-11-07 15:47:00 +01:00
parent ea938dbdb5
commit 18b7bebcc2
15 changed files with 188 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hooks/cinder_utils.py
View File

@@ -27,11 +27,6 @@ from charmhelpers.core.host import (
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,
@@ -397,13 +392,6 @@ def migrate_database():
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