Merge "conf: Move 'floating_ips' opts into 'network'"

This commit is contained in:
Jenkins 2017-05-05 14:40:12 +00:00 committed by Gerrit Code Review
commit 5a1f270b27

View File

@ -34,7 +34,6 @@ from nova.conf import crypto
from nova.conf import database
from nova.conf import ephemeral_storage
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 hyperv
@ -87,7 +86,6 @@ consoleauth.register_opts(CONF)
crypto.register_opts(CONF)
database.register_opts(CONF)
ephemeral_storage.register_opts(CONF)
floating_ips.register_opts(CONF)
flavors.register_opts(CONF)
glance.register_opts(CONF)
guestfs.register_opts(CONF)