aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHui Kang <kangh@us.ibm.com>2016-06-03 05:00:41 -0400
committerHui Kang <kangh@us.ibm.com>2016-06-03 05:00:41 -0400
commitc66eae3b106e25acaeeb7ac439aac441650eeb4a (patch)
treea0339a4a203d0942d7b85779046c087ddc15d11f
parent23d566a5e326185f98ddd76c0496ab182bf32751 (diff)
downloadkolla-c66eae3b106e25acaeeb7ac439aac441650eeb4a.tar.gz
kolla-c66eae3b106e25acaeeb7ac439aac441650eeb4a.zip
Add vars to the merge_config task in config-neutron-fake.yml
Change-Id: I3cb6c6a1879bb463da42d5d20fd6bb5d4b067a41 Closes-Bug: #1588722
-rw-r--r--ansible/roles/neutron/tasks/config-neutron-fake.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/ansible/roles/neutron/tasks/config-neutron-fake.yml b/ansible/roles/neutron/tasks/config-neutron-fake.yml
index 327165941..7051911f0 100644
--- a/ansible/roles/neutron/tasks/config-neutron-fake.yml
+++ b/ansible/roles/neutron/tasks/config-neutron-fake.yml
@@ -18,6 +18,8 @@
- name: Copying over neutron.conf
merge_configs:
+ vars:
+ service_name: "{{ item }}"
sources:
- "{{ role_path }}/templates/neutron.conf.j2"
- "{{ node_config_directory }}/config/global.conf"
@@ -34,6 +36,8 @@
- name: Copying over ml2_conf.ini
merge_configs:
+ vars:
+ service_name: "{{ item }}"
sources:
- "{{ role_path }}/templates/ml2_conf.ini.j2"
- "{{ node_config_directory }}/config/neutron/ml2_conf.ini"