Merge "Remove left over conf placeholders"

nova/conf/__init__.py

@@ -20,9 +20,7 @@
 from oslo_config import cfg
 
 from nova.conf import api
-# from nova.conf import api_database
 from nova.conf import availability_zone
-# from nova.conf import aws
 from nova.conf import base
 from nova.conf import cache
 from nova.conf import cells
@@ -34,31 +32,21 @@ from nova.conf import conductor
 from nova.conf import configdrive
 from nova.conf import console
 from nova.conf import consoleauth
-# from nova.conf import cors
-# from nova.conf import cors.subdomain
 from nova.conf import crypto
 from nova.conf import database
-# from nova.conf import disk
 from nova.conf import ephemeral_storage
 from nova.conf import exceptions
 from nova.conf import flavors
 from nova.conf import floating_ips
 from nova.conf import glance
 from nova.conf import guestfs
-# from nova.conf import host
 from nova.conf import hyperv
-# from nova.conf import image
-# from nova.conf import imagecache
 from nova.conf import image_file_url
 from nova.conf import ipv6
 from nova.conf import ironic
 from nova.conf import key_manager
-# from nova.conf import keystone_authtoken
 from nova.conf import libvirt
 from nova.conf import mks
-# from nova.conf import matchmaker_redis
-# from nova.conf import metadata
-# from nova.conf import metrics
 from nova.conf import netconf
 from nova.conf import network
 from nova.conf import neutron
@@ -74,30 +62,24 @@ from nova.conf import remote_debug
 from nova.conf import rpc
 from nova.conf import s3
 from nova.conf import scheduler
-# from nova.conf import security
 from nova.conf import serial_console
 from nova.conf import service
 from nova.conf import servicegroup
 from nova.conf import spice
 from nova.conf import ssl
-# from nova.conf import trusted_computing
 from nova.conf import upgrade_levels
 from nova.conf import virt
 from nova.conf import vmware
 from nova.conf import vnc
-# from nova.conf import volume
 from nova.conf import workarounds
 from nova.conf import wsgi
 from nova.conf import xenserver
 from nova.conf import xvp
-# from nova.conf import zookeeper
 
 CONF = cfg.CONF
 
 api.register_opts(CONF)
-# api_database.register_opts(CONF)
 availability_zone.register_opts(CONF)
-# aws.register_opts(CONF)
 base.register_opts(CONF)
 cache.register_opts(CONF)
 cells.register_opts(CONF)
@@ -109,31 +91,21 @@ conductor.register_opts(CONF)
 configdrive.register_opts(CONF)
 console.register_opts(CONF)
 consoleauth.register_opts(CONF)
-# cors.register_opts(CONF)
-# cors.subdomain.register_opts(CONF)
 crypto.register_opts(CONF)
 database.register_opts(CONF)
-# disk.register_opts(CONF)
 ephemeral_storage.register_opts(CONF)
 exceptions.register_opts(CONF)
 floating_ips.register_opts(CONF)
 flavors.register_opts(CONF)
 glance.register_opts(CONF)
 guestfs.register_opts(CONF)
-# host.register_opts(CONF)
 hyperv.register_opts(CONF)
 mks.register_opts(CONF)
-# image.register_opts(CONF)
-# imagecache.register_opts(CONF)
 image_file_url.register_opts(CONF)
 ipv6.register_opts(CONF)
 ironic.register_opts(CONF)
 key_manager.register_opts(CONF)
-# keystone_authtoken.register_opts(CONF)
 libvirt.register_opts(CONF)
-# matchmaker_redis.register_opts(CONF)
-# metadata.register_opts(CONF)
-# metrics.register_opts(CONF)
 netconf.register_opts(CONF)
 network.register_opts(CONF)
 neutron.register_opts(CONF)
@@ -148,22 +120,18 @@ rdp.register_opts(CONF)
 rpc.register_opts(CONF)
 s3.register_opts(CONF)
 scheduler.register_opts(CONF)
-# security.register_opts(CONF)
 serial_console.register_opts(CONF)
 service.register_opts(CONF)
 servicegroup.register_opts(CONF)
 spice.register_opts(CONF)
 ssl.register_opts(CONF)
-# trusted_computing.register_opts(CONF)
 upgrade_levels.register_opts(CONF)
 virt.register_opts(CONF)
 vmware.register_opts(CONF)
 vnc.register_opts(CONF)
-# volume.register_opts(CONF)
 workarounds.register_opts(CONF)
 wsgi.register_opts(CONF)
 xenserver.register_opts(CONF)
 xvp.register_opts(CONF)
-# zookeeper.register_opts(CONF)
 
 remote_debug.register_cli_opts(CONF)