openstack/kolla-ansible
Code Issues Proposed changes

Add vars to the merge_config task in config-neutron-fake.yml

Browse Source 
Change-Id: I3cb6c6a1879bb463da42d5d20fd6bb5d4b067a41
Closes-Bug: #1588722
This commit is contained in:
Hui Kang 2016-06-03 05:00:41 -04:00
parent 23d566a5e3
commit c66eae3b10
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/neutron/tasks/config-neutron-fake.yml
View File

@ -18,6 +18,8 @@
- name: Copying over neutron.conf - name: Copying over neutron.conf
merge_configs: merge_configs:
vars:
service_name: "{{ item }}"
sources: sources:
- "{{ role_path }}/templates/neutron.conf.j2" - "{{ role_path }}/templates/neutron.conf.j2"
- "{{ node_config_directory }}/config/global.conf" - "{{ node_config_directory }}/config/global.conf"
@ -34,6 +36,8 @@
- name: Copying over ml2_conf.ini - name: Copying over ml2_conf.ini
merge_configs: merge_configs:
vars:
service_name: "{{ item }}"
sources: sources:
- "{{ role_path }}/templates/ml2_conf.ini.j2" - "{{ role_path }}/templates/ml2_conf.ini.j2"
- "{{ node_config_directory }}/config/neutron/ml2_conf.ini" - "{{ node_config_directory }}/config/neutron/ml2_conf.ini"