From ad57661d519571b1679737683a30743c8365bdce Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Wed, 22 Jul 2015 22:39:54 -0700
Subject: [PATCH] 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
---
ansible/roles/neutron/tasks/config.yml | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index fcc7d6f5ab..b8f902dffe 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -19,6 +19,18 @@
config_dest: "{{ node_config_directory }}/{{ service_name }}/neutron.conf"
when: inventory_hostname in groups['neutron-server']
+- 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"
@@ -39,6 +51,18 @@
config_dest: "{{ node_config_directory }}/{{ service_name }}/neutron.conf"
when: inventory_hostname in groups['neutron-agents']
+- 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"
@@ -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']
--
GitLab