← Back to branch summary

~gandelman-a/ubuntu/precise/nova/UCA_2012.2.1

« back to all changes in this revision

Viewing changes to nova/openstack/common/cfg.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-08-16 14:04:11 UTC
  • mfrom: (1.1.59)
  • Revision ID: package-import@ubuntu.com-20120816140411-8dvudjblnx1w0mwx
Tags: 2012.2~f3-0ubuntu1
https://launchpad.net/bugs/1002111
[ Chuck Short ]
* New upstream version.
* debian/rules: Re-enable testsuite.
* debian/control:
  - Add python-quantumclient as a build depends.
  - Bump standards to 3.9.3
  - Fix lintian warnings.
  - Recommend python-glanceclient and python-keystoneclient.
  - Add dependency of iptables for nova-network.
* debian/watch: Update
* debian/rules: Do not run pep8 tests since upstream is still using an
  older pep8.
* debian/patches/0001-Update-tools-hacking-for-pep8-1.2-and-
  beyond.patch: Get the testsuite running again.
* debian/nova-volume.install, debian/nova_tgt: Add support for
  persistent volumes.

[ Adam Gandelman ]
* debian/{nova-api.install, nova-api-metadata.install}: Install
  api-metadata.filters. (LP: #1002111)
* debian/control: Added python-glanceclient.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/openstack/common/cfg.py
42
42
    osapi_compute_extension_opt = cfg.MultiStrOpt('osapi_compute_extension',
43
43
                                                  default=DEFAULT_EXTENSIONS)
44
44
 
45
 
Option schemas are registered with with the config manager at runtime, but
46
 
before the option is referenced::
 
45
Option schemas are registered with the config manager at runtime, but before
 
46
the option is referenced::
47
47
 
48
48
    class ExtensionManager(object):
49
49
 
464
464
    :raises: DuplicateOptError if a naming conflict is detected
465
465
    """
466
466
    if opt.dest in opts:
467
 
        if opts[opt.dest]['opt'] is not opt:
 
467
        if opts[opt.dest]['opt'] != opt:
468
468
            raise DuplicateOptError(opt.name)
469
469
        return True
470
470
    else:
527
527
        else:
528
528
            self.deprecated_name = None
529
529
 
 
530
    def __ne__(self, another):
 
531
        return vars(self) != vars(another)
 
532
 
530
533
    def _get_from_config_parser(self, cparser, section):
531
534
        """Retrieves the option value from a MultiConfigParser object.
532
535