From 27b030fb5cf3f779a5d3af2d9081dc22950f5233 Mon Sep 17 00:00:00 2001
From: Harry Huang <huangxiangyu5@huawei.com>
Date: Fri, 20 Jul 2018 17:12:25 +0800
Subject: Modify openvswitch installation

JIRA: COMPASS-604

1. Keep linux bridges when ODL scenario
2. degrade ovs to 2.8.0 for 2.9.0 has issue with ODL

Change-Id: I4433fb1bb4e2d64c7220296ca167f32e4a4246be
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
---
 .../adapters/ansible/roles/post-osa/tasks/main.yml |  1 +
 .../ansible/roles/setup-openvswitch/tasks/main.yml | 12 +++++++++--
 .../ansible/roles/setup-openvswitch/tasks/odl.yml  | 25 ++++++++++++++++++++++
 .../roles/setup-openvswitch/vars/Debian.yml        | 13 +++++++++++
 4 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 deploy/adapters/ansible/roles/setup-openvswitch/tasks/odl.yml

diff --git a/deploy/adapters/ansible/roles/post-osa/tasks/main.yml b/deploy/adapters/ansible/roles/post-osa/tasks/main.yml
index cf6ba1e3..e7e4c37d 100644
--- a/deploy/adapters/ansible/roles/post-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/post-osa/tasks/main.yml
@@ -11,6 +11,7 @@
   when:
     - inventory_hostname in groups['compute']
     - ansible_distribution == 'Ubuntu'
+    - NEUTRON_MECHANISM_DRIVERS[0] == "openvswitch"
 
 # install networking-sfc for non odl scenarios
 - include: install_networking_sfc.yml
diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml
index 87e508ca..2deecb3b 100644
--- a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml
@@ -10,9 +10,17 @@
 - include: controller.yml
   when:
     - inventory_hostname not in groups['nova_compute']
-    - NEUTRON_MECHANISM_DRIVERS[0] == "openvswitch" or "opendaylight"
+    - NEUTRON_MECHANISM_DRIVERS[0] == "openvswitch"
 
 - include: compute.yml
   when:
     - inventory_hostname in groups['nova_compute']
-    - NEUTRON_MECHANISM_DRIVERS[0] == "openvswitch" or "opendaylight"
+    - NEUTRON_MECHANISM_DRIVERS[0] == "openvswitch"
+
+- include_vars: "{{ ansible_os_family }}.yml"
+  when:
+    - NEUTRON_MECHANISM_DRIVERS[0] == "opendaylight"
+
+- include: odl.yml
+  when:
+    - NEUTRON_MECHANISM_DRIVERS[0] == "opendaylight"
diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/odl.yml b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/odl.yml
new file mode 100644
index 00000000..9c96a46a
--- /dev/null
+++ b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/odl.yml
@@ -0,0 +1,25 @@
+#############################################################################
+# Copyright (c) 2017-2018 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: uninstall ovs for odl
+  apt:
+    name: "{{ item.name }}"
+    state: absent
+  with_items: "{{ ovs_pkgs }}"
+
+- name: download ovs pkgs
+  get_url:
+    url: "{{ item.url }}"
+    dest: "/tmp/{{ item.package }}"
+  with_items: "{{ ovs_pkgs }}"
+
+- name: install ovs pkgs
+  shell:
+    dpkg -i "/tmp/{{ item.package }}"
+  with_items: "{{ ovs_pkgs }}"
diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/vars/Debian.yml b/deploy/adapters/ansible/roles/setup-openvswitch/vars/Debian.yml
index b6bd95a8..e9987787 100644
--- a/deploy/adapters/ansible/roles/setup-openvswitch/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/setup-openvswitch/vars/Debian.yml
@@ -1,3 +1,16 @@
 ---
 
 ovs_service: openvswitch-switch
+
+# yamllint disable rule:line-length
+ovs_pkgs:
+  - openvswitch-common:
+    name: openvswitch-common
+    package: openvswitch-common.deb
+    url: http://archive.ubuntu.com/ubuntu/pool/main/o/openvswitch/openvswitch-common_2.5.4-0ubuntu0.16.04.1_amd64.deb
+
+  - openvswitch-switch:
+    name: openvswitch-switch
+    package: openvswitch-switch.deb
+    url: http://archive.ubuntu.com/ubuntu/pool/main/o/openvswitch/openvswitch-switch_2.5.4-0ubuntu0.16.04.1_amd64.deb
+# yamllint enable rule:line-length
-- 
cgit 1.2.3-korg