Move config options from nova/api directory (5)

This is the fifth and final patch moving config options from the
nova/api directory. In this patch, the deprecated options from the
legacy_v2 directory have been moved to nova/conf/legacy_v2.py. A
subsequent patch will enhance the help text for these options.

Blueprint centralize-config-options-newton

Change-Id: I3fdff0d3c0c2f36155ad4f7060395e788b78d150

nova/conf/__init__.py

@@ -53,7 +53,7 @@ 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 legacy_api
+from nova.conf import legacy_api
 from nova.conf import libvirt
 from nova.conf import mks
 # from nova.conf import matchmaker_redis
@@ -128,7 +128,7 @@ ipv6.register_opts(CONF)
 ironic.register_opts(CONF)
 key_manager.register_opts(CONF)
 # keystone_authtoken.register_opts(CONF)
-# legacy_api.register_opts(CONF)
+legacy_api.register_opts(CONF)
 libvirt.register_opts(CONF)
 # matchmaker_redis.register_opts(CONF)
 # metadata.register_opts(CONF)

nova/tests/functional/api_sample_tests/test_aggregates.py

@@ -13,13 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
-
+import nova.conf
 from nova.tests.functional.api_sample_tests import api_sample_base
 
-CONF = cfg.CONF
-CONF.import_opt('osapi_compute_extension',
-                'nova.api.openstack.compute.legacy_v2.extensions')
+CONF = nova.conf.CONF
 
 
 class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):

setup.cfg

@@ -28,7 +28,6 @@ packages =
 oslo.config.opts =
     nova = nova.opts:list_opts
     nova.conf = nova.conf.opts:list_opts
-    nova.api = nova.api.opts:list_opts
     nova.cells = nova.cells.opts:list_opts
     nova.compute = nova.compute.opts:list_opts
     nova.network.neutronv2 = nova.network.neutronv2.api:list_opts