Merge "Use service_name variable when defined in neutron role"

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"