diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-03 19:48:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-03 19:48:47 +0000 |
| commit | 631ffab1ef3c0debbb0bf97a137ed84c374dec43 (patch) | |
| tree | b22e5ea7de5bdb01e163a3bb3d08f8eb25b2da49 /ansible | |
| parent | ad71352a93f68830e480334fec8c817e7c2675fc (diff) | |
| parent | c66eae3b106e25acaeeb7ac439aac441650eeb4a (diff) | |
| download | kolla-631ffab1ef3c0debbb0bf97a137ed84c374dec43.tar.gz kolla-631ffab1ef3c0debbb0bf97a137ed84c374dec43.zip | |
Merge "Add vars to the merge_config task in config-neutron-fake.yml"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/neutron/tasks/config-neutron-fake.yml | 4 |
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" |