← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to nova/volume/cinder.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short
  • Date: 2012-11-23 09:04:58 UTC
  • mfrom: (1.1.66)
  • Revision ID: package-import@ubuntu.com-20121123090458-91565o7aev1i1h71
Tags: 2013.1~g1-0ubuntu1
https://launchpad.net/bugs/1073289
https://launchpad.net/bugs/1076442
[ Adam Gandelman ]
* debian/control: Ensure novaclient is upgraded with nova,
  require python-keystoneclient >= 1:2.9.0. (LP: #1073289)
* debian/patches/{ubuntu/*, rbd-security.patch}: Dropped, applied
  upstream.
* debian/control: Add python-testtools to Build-Depends.

[ Chuck Short ]
* New upstream version.
* Refreshed debian/patches/avoid_setuptools_git_dependency.patch.
* debian/rules: FTBFS if missing binaries.
* debian/nova-scheudler.install: Add missing rabbit-queues and
  nova-rpc-zmq-receiver.
* Remove nova-volume since it doesnt exist anymore, transition to cinder-*.
* debian/rules: install apport hook in the right place.
* debian/patches/ubuntu-show-tests.patch: Display test failures.
* debian/control: Add depends on genisoimage
* debian/control: Suggest guestmount.
* debian/control: Suggest websockify. (LP: #1076442)
* debian/nova.conf: Disable nova-volume service.
* debian/control: Depend on xen-system-* rather than the hypervisor.
* debian/control, debian/mans/nova-conductor.8, debian/nova-conductor.init,
  debian/nova-conductor.install, debian/nova-conductor.logrotate
  debian/nova-conductor.manpages, debian/nova-conductor.postrm
  debian/nova-conductor.upstart.in: Add nova-conductor service.
* debian/control: Add python-fixtures as a build deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/volume/cinder.py
26
26
 
27
27
from nova.db import base
28
28
from nova import exception
29
 
from nova import flags
30
29
from nova.openstack.common import cfg
31
30
from nova.openstack.common import log as logging
32
31
 
42
41
                    'endpoint e.g. http://localhost:8776/v1/%(project_id)s'),
43
42
]
44
43
 
45
 
FLAGS = flags.FLAGS
46
 
FLAGS.register_opts(cinder_opts)
 
44
CONF = cfg.CONF
 
45
CONF.register_opts(cinder_opts)
47
46
 
48
47
LOG = logging.getLogger(__name__)
49
48
 
56
55
        'access': {'serviceCatalog': context.service_catalog or {}}
57
56
    }
58
57
    sc = service_catalog.ServiceCatalog(compat_catalog)
59
 
    if FLAGS.cinder_endpoint_template:
60
 
        url = FLAGS.cinder_endpoint_template % context.to_dict()
 
58
    if CONF.cinder_endpoint_template:
 
59
        url = CONF.cinder_endpoint_template % context.to_dict()
61
60
    else:
62
 
        info = FLAGS.cinder_catalog_info
 
61
        info = CONF.cinder_catalog_info
63
62
        service_type, service_name, endpoint_type = info.split(':')
64
63
        url = sc.url_for(service_type=service_type,
65
64
                         service_name=service_name,