Fix vpnaas custom config dir

node_custom_config is /etc/kolla/config
not need add config after.

Change-Id: Iac9747a705185e87b5e7d62856a9ada99f589078
Closes-Bug: #1671758
This commit is contained in:
Eduardo Gonzalez 2017-03-10 09:29:14 +00:00
parent 0160521337
commit 55beaca4a4

View File

@ -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: