From 1834c7dc4d9c423e3c0ccbf02c9ee1a9c2faf3d7 Mon Sep 17 00:00:00 2001 From: Maciej Szankin Date: Tue, 15 Nov 2016 09:42:33 -0600 Subject: [PATCH] conf: remove deprecated image url options Change-Id: I7687cc89545a7a8b295dd6535b4ccebc913a2e0e Implements: blueprint centralize-config-options-pike --- nova/conf/__init__.py | 2 -- setup.cfg | 2 -- 2 files changed, 4 deletions(-) diff --git a/nova/conf/__init__.py b/nova/conf/__init__.py index 82519b9ee..172040af7 100644 --- a/nova/conf/__init__.py +++ b/nova/conf/__init__.py @@ -41,7 +41,6 @@ from nova.conf import floating_ips from nova.conf import glance from nova.conf import guestfs from nova.conf import hyperv -from nova.conf import image_file_url from nova.conf import ipv6 from nova.conf import ironic from nova.conf import key_manager @@ -99,7 +98,6 @@ glance.register_opts(CONF) guestfs.register_opts(CONF) hyperv.register_opts(CONF) mks.register_opts(CONF) -image_file_url.register_opts(CONF) ipv6.register_opts(CONF) ironic.register_opts(CONF) key_manager.register_opts(CONF) diff --git a/setup.cfg b/setup.cfg index 9bdfb3f42..6fe7abeb5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -44,8 +44,6 @@ oslo.policy.policies = nova.compute.monitors.cpu = virt_driver = nova.compute.monitors.cpu.virt_driver:Monitor -nova.image.download.modules = - file = nova.image.download.file console_scripts = nova-all = nova.cmd.all:main nova-api = nova.cmd.api:main