diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-22 11:23:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-22 11:23:08 +0000 |
| commit | cf9404a3036ccd09b30c08fba4660f811202256a (patch) | |
| tree | 80beedab867b151407950b5357f653eff56e53f5 | |
| parent | 2cdaefe243fa44b03d23ac7a0dd170c6049e95a2 (diff) | |
| parent | cbe374ce30808d0ba647ec4af4d16758a8a0ff62 (diff) | |
| download | kolla-ansible-cf9404a3036ccd09b30c08fba4660f811202256a.tar.gz kolla-ansible-cf9404a3036ccd09b30c08fba4660f811202256a.zip | |
Merge "Use service_name variable when defined in neutron role"
| -rw-r--r-- | ansible/roles/neutron/tasks/config.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml index c80f55af5..49c1ddca1 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" |