diff options
| author | Tracy Jones <tjones@vmware.com> | 2015-12-11 08:24:18 -0800 |
|---|---|---|
| committer | Daniel Berrange <berrange@redhat.com> | 2016-04-04 16:39:02 +0000 |
| commit | 185e00ee745c94bca191002c106600f5ebfcc99b (patch) | |
| tree | 4108692c0b94eab6f128a2ae668a5cf97d49e47b /nova/cmd/api.py | |
| parent | b35a1105bf7b275fd43377dd17db0ce56fbf0b7f (diff) | |
| download | nova-185e00ee745c94bca191002c106600f5ebfcc99b.tar.gz | |
config options: centralize section "service"
Move options from 'service' to 'conf/service.py'.
Change-Id: I621481590d93b806ea17d498a562da87207001f3
Co-Authored-By: Stephen Finucane <stephen.finucane@intel.com>
Implements: blueprint centralize-config-options-newton
Diffstat (limited to 'nova/cmd/api.py')
| -rw-r--r-- | nova/cmd/api.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nova/cmd/api.py b/nova/cmd/api.py index a63871b565..8e6f9f84a6 100644 --- a/nova/cmd/api.py +++ b/nova/cmd/api.py @@ -22,19 +22,17 @@ Starts both the EC2 and OpenStack APIs in separate greenthreads. import sys -from oslo_config import cfg from oslo_log import log as logging from oslo_reports import guru_meditation_report as gmr +import nova.conf from nova import config from nova import objects from nova import service from nova import utils from nova import version -CONF = cfg.CONF -CONF.import_opt('enabled_apis', 'nova.service') -CONF.import_opt('enabled_ssl_apis', 'nova.service') +CONF = nova.conf.CONF def main(): |