openstack
/
neutron
Code Issues Proposed changes

Merge "Fix missing availability_zone in dhcp and l3 conf"

This commit is contained in:
Jenkins 2016-07-06 08:46:57 +00:00 committed by Gerrit Code Review
parent 77cdddb055 a095581a69
commit 0f8e23f235
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/opts.py
View File

@ -157,7 +157,11 @@ def list_base_agent_opts():
neutron.agent.common.config.INTERFACE_DRIVER_OPTS,
neutron.agent.common.ovs_lib.OPTS)
),
('AGENT', neutron.agent.common.config.AGENT_STATE_OPTS)
('AGENT',
itertools.chain(
neutron.agent.common.config.AGENT_STATE_OPTS,
neutron.agent.common.config.AVAILABILITY_ZONE_OPTS)
)
]