Merge "Fix vpnaas custom config dir"

This commit is contained in:
Jenkins 2017-03-15 11:01:29 +00:00 committed by Gerrit Code Review
commit 7d2a58fb00

@ -242,7 +242,7 @@
merge_configs: merge_configs:
sources: sources:
- "{{ role_path }}/templates/vpnaas_agent.ini.j2" - "{{ role_path }}/templates/vpnaas_agent.ini.j2"
- "{{ node_custom_config }}/config/neutron/vpnaas_agent.ini" - "{{ node_custom_config }}/neutron/vpnaas_agent.ini"
dest: "{{ node_config_directory }}/{{ service_name }}/vpnaas_agent.ini" dest: "{{ node_config_directory }}/{{ service_name }}/vpnaas_agent.ini"
register: neutron_vpnaas_agent_ini register: neutron_vpnaas_agent_ini
when: when: