From: Anil Belur <abelur@linuxfoundation.org>
Date: Wed, 31 Mar 2021 22:06:46 +0000 (+1000)
Subject: Update to OVS v2.6.10 on Ubuntu 18.04
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=b9730a3a94ff1005468c812fc543c45beccc1911;p=releng%2Fbuilder.git

Update to OVS v2.6.10 on Ubuntu 18.04

This fixes build errors with v2.6 on Ubuntu 18.04.

Change-Id: Ie544e340fbe074cbe3c12621c7bfeb4ef256e099
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/packer/provision/mininet-ovs-2.6.yaml b/packer/provision/mininet-ovs-2.6.yaml
index bb8914431..707f3778c 100644
--- a/packer/provision/mininet-ovs-2.6.yaml
+++ b/packer/provision/mininet-ovs-2.6.yaml
@@ -5,8 +5,8 @@
   become_user: root
   become_method: sudo
   vars:
-    ovs_version: 2.6.1
-    ovs_checksum: sha256:307b20aba6a179bf13e5da9ac242933c31349073762473a9d4782619c8c1cf0c
+    ovs_version: 2.6.10
+    ovs_checksum: sha256:dc9017013e57e90806a5ee11d5a6b815bc37fab7bec3d713296a16c749c01084
 
   pre_tasks:
     - include_role: name=lfit.system-update
@@ -40,8 +40,8 @@
           become: true
         - name: "Fetch OpenVSwitch {{ovs_version}} to /tmp"
           get_url:
-            url: "http://openvswitch.org/releases/openvswitch-2.6.1.tar.gz"
-            dest: "/tmp/openvswitch-2.6.1.tar.gz"
+            url: "http://openvswitch.org/releases/openvswitch-{{ovs_version}}.tar.gz"
+            dest: "/tmp/openvswitch-{{ovs_version}}.tar.gz"
             checksum: "{{ovs_checksum}}"
         - name: "Unarchive OpenVSwitch {{ovs_version}}"
           unarchive:
@@ -57,10 +57,10 @@
         - name: "Install OpenVSwitch {{ovs_version}}"
           apt: "deb={{item}}"
           with_items:
-            - /opt/ovs/openvswitch-common_2.6.1-1_amd64.deb
-            - /opt/ovs/openvswitch-switch_2.6.1-1_amd64.deb
-            - /opt/ovs/python-openvswitch_2.6.1-1_all.deb
-            - /opt/ovs/openvswitch-vtep_2.6.1-1_amd64.deb
+            - /opt/ovs/openvswitch-common_{{ovs_version}}-1_amd64.deb
+            - /opt/ovs/openvswitch-switch_{{ovs_version}}-1_amd64.deb
+            - /opt/ovs/python-openvswitch_{{ovs_version}}-1_all.deb
+            - /opt/ovs/openvswitch-vtep_{{ovs_version}}-1_amd64.deb
           become: true
         - name: Enable openvswitch-switch service
           systemd: