From 90a9590df449c747470c79778c96d555d563402d Mon Sep 17 00:00:00 2001 From: EdLeafe Date: Mon, 15 Feb 2016 17:43:20 +0000 Subject: [PATCH] Move config options from nova/network/manager.py This patch moves the config options from the nova/network/manager.py file into the nova/conf/network.py file. Blueprint centralize-config-options-newton Change-Id: I7a00e6516762ae3794a14358d609be6e174926eb --- nova/conf/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nova/conf/__init__.py b/nova/conf/__init__.py index 3b66a3965..2090b9428 100644 --- a/nova/conf/__init__.py +++ b/nova/conf/__init__.py @@ -54,7 +54,7 @@ from nova.conf import ironic # from nova.conf import matchmaker_redis # from nova.conf import metadata # from nova.conf import metrics -# from nova.conf import network +from nova.conf import network # from nova.conf import neutron # from nova.conf import notification # from nova.conf import osapi_v21 @@ -114,7 +114,7 @@ ironic.register_opts(CONF) # matchmaker_redis.register_opts(CONF) # metadata.register_opts(CONF) # metrics.register_opts(CONF) -# network.register_opts(CONF) +network.register_opts(CONF) # neutron.register_opts(CONF) # notification.register_opts(CONF) # osapi_v21.register_opts(CONF)