← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to nova/common/cfg.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-01-20 11:54:15 UTC
  • mto: This revision was merged to the branch mainline in revision 62.
  • Revision ID: package-import@ubuntu.com-20120120115415-h2ujma9o536o1ut6
Tags: upstream-2012.1~e3~20120120.12170
Import upstream version 2012.1~e3~20120120.12170

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/common/cfg.py
32
32
 
33
33
    enabled_apis_opt = \
34
34
        cfg.ListOpt('enabled_apis',
35
 
                    default=['ec2', 'osapi'],
 
35
                    default=['ec2', 'osapi_compute'],
36
36
                    help='List of APIs to enable by default')
37
37
 
38
38
    DEFAULT_EXTENSIONS = [
39
39
        'nova.api.openstack.contrib.standard_extensions'
40
40
    ]
41
 
    osapi_extension_opt = \
42
 
        cfg.MultiStrOpt('osapi_extension',
 
41
    osapi_compute_extension_opt = \
 
42
        cfg.MultiStrOpt('osapi_compute_extension',
43
43
                        default=DEFAULT_EXTENSIONS)
44
44
 
45
45
Option schemas are registered with with the config manager at runtime, but
55
55
            ...
56
56
 
57
57
        def _load_extensions(self):
58
 
            for ext_factory in self.conf.osapi_extension:
 
58
            for ext_factory in self.conf.osapi_compute_extension:
59
59
                ....
60
60
 
61
61
A common usage pattern is for each option schema to be defined in the module or