openstack
/
charm-cinder-ceph
Code Issues Proposed changes

Ensure we setup the ceph-access relation 

Change-Id: I0d95523fd84338ca55e141c12231f82bf99056df
Closes-bug: #1711642
This commit is contained in:
Chris MacNaughton 2017-08-22 15:30:15 +02:00
parent c91259f50f
commit b928e65019
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hooks/cinder_hooks.py
View File

@ -119,6 +119,8 @@ def ceph_changed():
set_ceph_env_variables(service=service)
for rid in relation_ids('storage-backend'):
storage_backend(rid)
for r_id in relation_ids('ceph-access'):
ceph_access_joined(r_id)
# Ensure that cinder-volume is restarted since only now can we
# guarantee that ceph resources are ready.
service_restart('cinder-volume')
@ -187,7 +189,8 @@ def leader_settings_changed():
storage_backend(r_id)
@hooks.hook('ceph-access-relation-joined')
@hooks.hook('ceph-access-relation-joined',
'ceph-access-relation-changed')
def ceph_access_joined(relation_id=None):
if 'ceph' not in CONFIGS.complete_contexts():
log('Deferring key provision until ceph relation complete')