From c66eae3b106e25acaeeb7ac439aac441650eeb4a Mon Sep 17 00:00:00 2001
From: Hui Kang <kangh@us.ibm.com>
Date: Fri, 3 Jun 2016 05:00:41 -0400
Subject: [PATCH] Add vars to the merge_config task in config-neutron-fake.yml

Change-Id: I3cb6c6a1879bb463da42d5d20fd6bb5d4b067a41
Closes-Bug: #1588722
---
 ansible/roles/neutron/tasks/config-neutron-fake.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ansible/roles/neutron/tasks/config-neutron-fake.yml b/ansible/roles/neutron/tasks/config-neutron-fake.yml
index 3271659412..7051911f00 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"