← Back to branch summary

~cbjchen/charms/trusty/cinder-ceph/remove_stale_key

« back to all changes in this revision

Viewing changes to hooks/cinder_hooks.py

  • Committer: James Page
  • Date: 2014-01-23 16:38:22 UTC
  • Revision ID: james.page@canonical.com-20140123163822-kpkf9tmfpryfktj7
Fixes from testing

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/cinder_hooks.py
2
2
 
3
3
import os
4
4
import sys
 
5
import json
5
6
 
6
7
from cinder_utils import (
7
8
    ensure_ceph_pool,
90
91
    if 'ceph' not in CONFIGS.complete_contexts():
91
92
        log('ceph relation incomplete. Peer not ready?')
92
93
    else:
93
 
        relation_set(relation_id=rel_id,
94
 
                     subordinate_configuration=CephSubordinateContext())
 
94
        relation_set(
 
95
            relation_id=rel_id,
 
96
            subordinate_configuration=json.dumps(CephSubordinateContext()())
 
97
        )
95
98
 
96
99
 
97
100
if __name__ == '__main__':