← Back to branch summary

~openstack-charmers/charms/precise/cinder-ceph/old-1410

« back to all changes in this revision

Viewing changes to hooks/cinder_contexts.py

  • Committer: James Page
  • Date: 2014-04-02 08:31:50 UTC
  • Revision ID: james.page@canonical.com-20140402083150-wgqh1jbzhgx8kljl
Add some more tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/cinder_contexts.py
1
1
from charmhelpers.core.hookenv import (
2
2
    service_name,
3
3
    is_relation_made,
4
 
    config
5
4
)
6
5
 
7
6
from charmhelpers.contrib.openstack.context import (
8
7
    OSContextGenerator,
9
8
)
10
9
 
11
 
from charmhelpers.contrib.openstack.utils import get_os_codename_install_source
 
10
from charmhelpers.contrib.openstack.utils import get_os_codename_package
12
11
 
13
12
 
14
13
class CephSubordinateContext(OSContextGenerator):
22
21
        if not is_relation_made('ceph', 'key'):
23
22
            return {}
24
23
        service = service_name()
25
 
        if get_os_codename_install_source(config('openstack-origin')) \
26
 
                >= "icehouse":
 
24
        if get_os_codename_package('cinder-common') >= "icehouse":
27
25
            volume_driver = 'cinder.volume.drivers.rbd.RBDDriver'
28
26
        else:
29
27
            volume_driver = 'cinder.volume.driver.RBDDriver'