From 3bc3a8828c3ceefedd08e1767ae6e3bf2df9ac22 Mon Sep 17 00:00:00 2001
From: Harry Huang <huangxiangyu5@huawei.com>
Date: Wed, 23 Aug 2017 15:05:02 +0800
Subject: Support multiple physnet mapping

JIRA: COMPASS-559

1. support multiple mapping in provider_net_mappings
of network.yml and create corresponding ovs bridges
2. support seperate config in sys_intf_mappings
of network.yml
3. remove linux bridges in compute nodes for ovs
port binding convenience
4. support openstack vlan tenant network
5. modify odl and odl_sfc roles to use configurable
provider mapping
6. remove some hard coding

Change-Id: Ib57484ce60d029f89c647fd5baf2c7af37c85d0b
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
---
 .../roles/setup-openvswitch/tasks/controller.yml   | 49 ++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 deploy/adapters/ansible/roles/setup-openvswitch/tasks/controller.yml

(limited to 'deploy/adapters/ansible/roles/setup-openvswitch/tasks/controller.yml')

diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/controller.yml b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/controller.yml
new file mode 100644
index 00000000..258a39e2
--- /dev/null
+++ b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/controller.yml
@@ -0,0 +1,49 @@
+#############################################################################
+# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+#############################################################################
+---
+- name: stop neutron-openvswitch-agent
+  service:
+    name: neutron-openvswitch-agent
+    state: stopped
+
+- name: remove tunnel_types when vlan
+  lineinfile:
+    dest: /etc/neutron/plugins/ml2/openvswitch_agent.ini
+    state: absent
+    regexp: '^tunnel_types'
+  when:
+    - tenant_net_info["type"] == "vlan"
+  notify:
+    - restart neutron-openvswitch-agent
+
+- name: create controller bridges
+  openvswitch_bridge:
+    bridge: "{{ item['name'] }}"
+    state: present
+  with_items:
+    - "{{ provider_net_mappings }}"
+  when:
+    - controller in item["role"]
+  notify:
+    - restart neutron-openvswitch-agent
+
+- name: create controller bridge ports
+  openvswitch_port:
+    bridge: "{{ item['name'] }}"
+    port: "{{ item['interface'] }}"
+    state: present
+  with_items:
+    - "{{ provider_net_mappings }}"
+  when:
+    - controller in item["role"]
+
+- name: stop neutron-openvswitch-agent
+  service:
+    name: neutron-openvswitch-agent
+    state: started
-- 
cgit 1.2.3-korg