Fixes from testing

This commit is contained in:
James Page 2014-01-23 16:38:22 +00:00
parent 74e831c061
commit 215837b7a8
3 changed files with 10 additions and 3 deletions

View File

@ -2,6 +2,7 @@
import os
import sys
import json
from cinder_utils import (
ensure_ceph_pool,
@ -90,8 +91,10 @@ def storage_backend(rel_id=None):
if 'ceph' not in CONFIGS.complete_contexts():
log('ceph relation incomplete. Peer not ready?')
else:
relation_set(relation_id=rel_id,
subordinate_configuration=CephSubordinateContext())
relation_set(
relation_id=rel_id,
subordinate_configuration=json.dumps(CephSubordinateContext()())
)
if __name__ == '__main__':

View File

@ -7,10 +7,14 @@ description: |
This charm provides a Ceph storage backend for Cinder
categories:
- miscellaneous
subordinate: true
provides:
storage-backend:
interface: cinder-backend
scope: container
requires:
juju-info:
interface: juju-info
scope: container
ceph:
interface: ceph-client

View File

@ -1 +1 @@
1
2