diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-10 21:13:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-10 21:13:11 +0000 |
| commit | 754320ec661c628d1a7263dc34fd98d6554e652b (patch) | |
| tree | e255c5b2267080eee3dff05e85967f47ebf7e50a /nova/api | |
| parent | f6f8d96b2686733800ffcd804a490f44ea707185 (diff) | |
| parent | d1888a3359345acffd8d0845c137eefd88072112 (diff) | |
| download | nova-754320ec661c628d1a7263dc34fd98d6554e652b.tar.gz nova-754320ec661c628d1a7263dc34fd98d6554e652b.tar.xz nova-754320ec661c628d1a7263dc34fd98d6554e652b.zip | |
Merge "Remove the last of the gflags shim layer"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/auth.py | 2 | ||||
| -rw-r--r-- | nova/api/ec2/__init__.py | 2 | ||||
| -rw-r--r-- | nova/api/openstack/compute/__init__.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/auth.py b/nova/api/auth.py index a1a375d7c..518647ae1 100644 --- a/nova/api/auth.py +++ b/nova/api/auth.py @@ -34,7 +34,7 @@ use_forwarded_for_opt = cfg.BoolOpt('use_forwarded_for', 'Only enable this if you have a sanitizing proxy.') FLAGS = flags.FLAGS -FLAGS.add_option(use_forwarded_for_opt) +FLAGS.register_opt(use_forwarded_for_opt) class InjectContext(wsgi.Middleware): diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index bcd7b239e..bbce2c0d4 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -59,7 +59,7 @@ ec2_opts = [ ] FLAGS = flags.FLAGS -FLAGS.add_options(ec2_opts) +FLAGS.register_opts(ec2_opts) flags.DECLARE('use_forwarded_for', 'nova.api.auth') diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py index 3884ffbad..e23fe7b87 100644 --- a/nova/api/openstack/compute/__init__.py +++ b/nova/api/openstack/compute/__init__.py @@ -44,7 +44,7 @@ allow_instance_snapshots_opt = \ help='Permit instance snapshot operations.') FLAGS = flags.FLAGS -FLAGS.add_option(allow_instance_snapshots_opt) +FLAGS.register_opt(allow_instance_snapshots_opt) class APIRouter(nova.api.openstack.APIRouter): |