openstack/placement
Code Issues Proposed changes

Merge "conf: remove deprecated image url options"

Browse Source
This commit is contained in:
Jenkins 2017-02-09 12:23:19 +00:00 committed by Gerrit Code Review
commit 7e4a543781
2 changed files with 0 additions and 4 deletions

2
nova/conf/__init__.py

@ -39,7 +39,6 @@ from nova.conf import floating_ips
from nova.conf import glance from nova.conf import glance
from nova.conf import guestfs from nova.conf import guestfs
from nova.conf import hyperv from nova.conf import hyperv
from nova.conf import image_file_url
from nova.conf import ipv6 from nova.conf import ipv6
from nova.conf import ironic from nova.conf import ironic
from nova.conf import key_manager from nova.conf import key_manager
@ -96,7 +95,6 @@ glance.register_opts(CONF)
guestfs.register_opts(CONF) guestfs.register_opts(CONF)
hyperv.register_opts(CONF) hyperv.register_opts(CONF)
mks.register_opts(CONF) mks.register_opts(CONF)
image_file_url.register_opts(CONF)
ipv6.register_opts(CONF) ipv6.register_opts(CONF)
ironic.register_opts(CONF) ironic.register_opts(CONF)
key_manager.register_opts(CONF) key_manager.register_opts(CONF)

2
setup.cfg

@ -44,8 +44,6 @@ oslo.policy.policies =
nova.compute.monitors.cpu = nova.compute.monitors.cpu =
virt_driver = nova.compute.monitors.cpu.virt_driver:Monitor virt_driver = nova.compute.monitors.cpu.virt_driver:Monitor
nova.image.download.modules =
file = nova.image.download.file
console_scripts = console_scripts =
nova-api = nova.cmd.api:main nova-api = nova.cmd.api:main
nova-api-metadata = nova.cmd.api_metadata:main nova-api-metadata = nova.cmd.api_metadata:main