← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/api/openstack/compute/extensions.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/api/openstack/compute/extensions.py
16
16
#    under the License.
17
17
 
18
18
from nova.api.openstack import extensions as base_extensions
19
 
from nova import flags
 
19
from nova.openstack.common import cfg
20
20
from nova.openstack.common import log as logging
21
21
from nova.openstack.common.plugin import pluginmanager
22
22
 
23
23
 
24
24
LOG = logging.getLogger(__name__)
25
 
FLAGS = flags.FLAGS
 
25
CONF = cfg.CONF
 
26
CONF.import_opt('osapi_compute_extension', 'nova.config')
26
27
 
27
28
 
28
29
class ExtensionManager(base_extensions.ExtensionManager):
29
30
    def __init__(self):
30
31
        LOG.audit(_('Initializing extension manager.'))
31
 
        self.cls_list = FLAGS.osapi_compute_extension
 
32
        self.cls_list = CONF.osapi_compute_extension
32
33
        self.PluginManager = pluginmanager.PluginManager('nova',
33
34
                                                         'compute-extensions')
34
35
        self.PluginManager.load_plugins()