openstack
/
neutron-lbaas
Code Issues Proposed changes

Merge "Updating imports for services prov_config options"

This commit is contained in:
Jenkins 2016-08-25 08:00:35 +00:00 committed by Gerrit Code Review
parent 7aa3d9ff9c 60c1c945e4
commit 5c8c065ef1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron_lbaas/opts.py
View File

@ -14,7 +14,7 @@ import itertools
import neutron.agent.common.config
import neutron.agent.linux.interface
import neutron.services.provider_configuration
import neutron.conf.services.provider_configuration
import neutron_lbaas.agent.agent
import neutron_lbaas.common.cert_manager
@ -46,7 +46,7 @@ def list_opts():
('service_auth',
neutron_lbaas.common.keystone.OPTS),
('service_providers',
neutron.services.provider_configuration.serviceprovider_opts),
neutron.conf.services.provider_configuration.serviceprovider_opts),
('certificates',
itertools.chain(
neutron_lbaas.common.cert_manager.cert_manager_opts,