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/compute | |
| 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/compute')
| -rw-r--r-- | nova/compute/api.py | 2 | ||||
| -rw-r--r-- | nova/compute/manager.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 5216382df..ff63842f7 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -55,7 +55,7 @@ find_host_timeout_opt = cfg.StrOpt('find_host_timeout', help='Timeout after NN seconds when looking for a host.') FLAGS = flags.FLAGS -FLAGS.add_option(find_host_timeout_opt) +FLAGS.register_opt(find_host_timeout_opt) flags.DECLARE('enable_zone_routing', 'nova.scheduler.api') flags.DECLARE('consoleauth_topic', 'nova.consoleauth') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 6ca4fbb65..90a6a84ec 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -119,7 +119,7 @@ compute_opts = [ ] FLAGS = flags.FLAGS -FLAGS.add_options(compute_opts) +FLAGS.register_opts(compute_opts) LOG = logging.getLogger('nova.compute.manager') |