aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-15 02:36:34 +0000
committerGerrit Code Review <review@openstack.org>2016-06-15 02:36:34 +0000
commit07924c9ade87f0cfa1edd0fdf99237213c34d317 (patch)
tree62f80a3b880b8b536a211950c9ae0b40e35dd0de
parent55fb29bc3ffca3fca92442f60e0e5ecfe15ae4f0 (diff)
parent977a46ce225249f9596e556dbc48bd50226d8983 (diff)
downloadkolla-07924c9ade87f0cfa1edd0fdf99237213c34d317.tar.gz
kolla-07924c9ade87f0cfa1edd0fdf99237213c34d317.zip
Merge "Makes ml2_conf.ini configuration consistent"
-rw-r--r--ansible/roles/neutron/tasks/config.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index e99e446c2..9c285b50e 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -69,7 +69,7 @@
sources:
- "{{ role_path }}/templates/ml2_conf.ini.j2"
- "{{ node_custom_config }}/neutron/ml2_conf.ini"
- - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/neutron.conf"
+ - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/ml2_conf.ini"
dest: "{{ node_config_directory }}/{{ item }}/ml2_conf.ini"
with_items:
- "neutron-dhcp-agent"