Merge "Fix the subprocess invocation of neutron-l3-agent"

This commit is contained in:
Zuul 2019-02-01 03:21:23 +00:00 committed by Gerrit Code Review
commit 2fb4715a89
2 changed files with 5 additions and 0 deletions

View File

@ -0,0 +1,3 @@
---
fixes:
- Fixes neutron HA routers, by enabling ``neutron-l3-agent`` to invoke the required helper script.

View File

@ -386,6 +386,8 @@ neutron_services:
service_conf_path: "{{ neutron_conf_dir }}"
service_conf: l3_agent.ini
service_rootwrap: rootwrap.d/l3.filters
environment:
PATH: "{{ neutron_bin }}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
execstarts: "{{ neutron_bin }}/neutron-l3-agent --config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/l3_agent.ini --log-file={{ neutron_log_dir }}/neutron-l3-agent.log"
config_overrides: "{{ neutron_l3_agent_ini_overrides }}"
config_type: "ini"