openstack
/
neutron
Code Issues Proposed changes

Fix missing availability_zone in dhcp and l3 conf 

Now availability_zone attribute can be defined in dhcp-agent
and l3-agent. But the config had not generated in dhcp_agent.ini
and l3_agent.ini

This patch add availability_zone in base_agent_opts. That will
apply in dhcp and l3 agent conf.

Closes-Bug: #1589745
Change-Id: I9fdc39b1f9abd48a4b55e0a917e41bf68be56595
This commit is contained in:
Dongcan Ye 2016-06-06 13:21:47 +08:00
parent fc058226d7
commit a095581a69
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)
)
]