From cbe374ce30808d0ba647ec4af4d16758a8a0ff62 Mon Sep 17 00:00:00 2001
From: Bertrand Lallau <bertrand.lallau@gmail.com>
Date: Tue, 21 Mar 2017 21:19:48 +0100
Subject: [PATCH] Use service_name variable when defined in neutron role

service_name variable is defined in tasks but not used everywhere.

Change-Id: I67a95f49d277cf004338a9c184e7be70608714b7
---
 ansible/roles/neutron/tasks/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index c80f55af5a..49c1ddca13 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -223,7 +223,7 @@
 - name: Copying over lbaas_agent.ini
   vars:
     service_name: "neutron-lbaas-agent"
-    neutron_lbaas_agent: "{{ neutron_services['neutron-lbaas-agent'] }}"
+    neutron_lbaas_agent: "{{ neutron_services[service_name] }}"
   merge_configs:
     sources:
       - "{{ role_path }}/templates/lbaas_agent.ini.j2"
@@ -239,7 +239,7 @@
 - name: Copying over vpnaas_agent.ini
   vars:
     service_name: "neutron-vpnaas-agent"
-    neutron_vpnaas_agent: "{{ neutron_services['neutron-vpnaas-agent'] }}"
+    neutron_vpnaas_agent: "{{ neutron_services[service_name] }}"
   merge_configs:
     sources:
       - "{{ role_path }}/templates/vpnaas_agent.ini.j2"
@@ -255,7 +255,7 @@
 - name: Copying over bgp_dragent.ini
   vars:
     service_name: "neutron-bgp-dragent"
-    neutron_bgp_dragent: "{{ neutron_services['neutron-bgp-dragent'] }}"
+    neutron_bgp_dragent: "{{ neutron_services[service_name] }}"
   merge_configs:
     sources:
       - "{{ role_path }}/templates/bgp_dragent.ini.j2"