Merge "Config options: centralize options in availability_zones"

This commit is contained in:
Jenkins 2016-02-20 04:49:14 +00:00 committed by Gerrit Code Review
commit c156503f12

View File

@ -21,7 +21,7 @@ from oslo_config import cfg
# from nova.conf import api
# from nova.conf import api_database
# from nova.conf import availability_zone
from nova.conf import availability_zone
# from nova.conf import aws
# from nova.conf import barbican
# from nova.conf import base
@ -81,7 +81,7 @@ CONF = cfg.CONF
# api.register_opts(CONF)
# api_database.register_opts(CONF)
# availability_zone.register_opts(CONF)
availability_zone.register_opts(CONF)
# aws.register_opts(CONF)
# barbican.register_opts(CONF)
# base.register_opts(CONF)