diff options
| author | Steven Dake <stdake@cisco.com> | 2015-07-22 22:39:54 -0700 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-07-23 13:01:07 +0000 |
| commit | ad57661d519571b1679737683a30743c8365bdce (patch) | |
| tree | 00f26b66bf6d0d102590f6e6a2cc02112bc08d35 | |
| parent | 6d4a55060e13723138facd90dc9786e7f2c3684b (diff) | |
| download | kolla-ad57661d519571b1679737683a30743c8365bdce.tar.gz kolla-ad57661d519571b1679737683a30743c8365bdce.zip | |
Copy ml2_conf.ini to correct location
The ml2_conf.ini file which sets OpenVswitch as the mechanism driver
was not being copied to the corect place. This patch resolves that
problem.
Change-Id: Ia276916a3183564c9b7d8d6aa9595c384ed99cf6
Closes-Bug: #1477399
| -rw-r--r-- | ansible/roles/neutron/tasks/config.yml | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml index fcc7d6f5a..b8f902dff 100644 --- a/ansible/roles/neutron/tasks/config.yml +++ b/ansible/roles/neutron/tasks/config.yml @@ -21,6 +21,18 @@ - include: ../../config.yml vars: + service_name: "neutron-server" + config_source: + - "roles/{{ project_name }}/templates/ml2_conf.ini.j2" + - "/etc/kolla/config/{{ project_name }}/ml2_conf.ini" + config_template_dest: + - "{{ node_templates_directory }}/{{ service_name }}/ml2_conf.ini_minimal" + - "{{ node_templates_directory }}/{{ service_name }}/ml2_conf.ini_augment" + config_dest: "{{ node_config_directory }}/{{ service_name }}/ml2_conf.ini" + when: inventory_hostname in groups['neutron-server'] + +- include: ../../config.yml + vars: service_name: "neutron-agents" config_source: - "roles/{{ project_name }}/templates/neutron.conf.j2" @@ -41,6 +53,18 @@ - include: ../../config.yml vars: + service_name: "neutron-agents" + config_source: + - "roles/{{ project_name }}/templates/ml2_conf.ini.j2" + - "/etc/kolla/config/{{ project_name }}/ml2_conf.ini" + config_template_dest: + - "{{ node_templates_directory }}/{{ service_name }}/ml2_conf.ini_minimal" + - "{{ node_templates_directory }}/{{ service_name }}/ml2_conf.ini_augment" + config_dest: "{{ node_config_directory }}/{{ service_name }}/ml2_conf.ini" + when: inventory_hostname in groups['neutron-agents'] + +- include: ../../config.yml + vars: service_name: "neutron-openvswitch-agent" config_source: - "roles/{{ project_name }}/templates/neutron.conf.j2" @@ -69,6 +93,6 @@ config_template_dest: - "{{ node_templates_directory }}/{{ service_name }}/ml2_conf.ini_minimal" - "{{ node_templates_directory }}/{{ service_name }}/ml2_conf.ini_augment" - config_dest: "{{ node_config_directory }}/ml2_conf.ini" + config_dest: "{{ node_config_directory }}/{{ service_name }}/ml2_conf.ini" when: inventory_hostname in groups['neutron-agents'] or inventory_hostname in groups['compute'] |