X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packer%2Fprovision%2Fmininet-ovs-2.8.yaml;h=ad887d87547c56dd69c7beb5f0fc1375f3380e09;hb=68694002f1dc8ab6a663289963baa7a21e1de167;hp=f07daa8a1f7da9206f4fc9eb4313ef5dc7c3f267;hpb=a65451bc04b40633e89fe507fc119b9a65cc96a4;p=releng%2Fbuilder.git

diff --git a/packer/provision/mininet-ovs-2.8.yaml b/packer/provision/mininet-ovs-2.8.yaml
index f07daa8a1..ad887d875 100644
--- a/packer/provision/mininet-ovs-2.8.yaml
+++ b/packer/provision/mininet-ovs-2.8.yaml
@@ -5,59 +5,60 @@
   become_user: root
   become_method: sudo
   vars:
-    ovs_checksum: sha256:8d1c439e26d7044f0ec823c7fef1b00b7c6465da0b83a7d0cf3191ed1dc43893
-    ovs_version: 2.8.1
+    ovs_checksum: sha256:e40227e366db55f997344876a692918af68430bcb5fd3bd9ffe8dfd8c0bdd51f
+    ovs_version: 2.8.11
 
   pre_tasks:
     - include_role: name=lfit.system-update
 
   tasks:
-    - name: 'Install OpenVSwitch {{ovs_version}}'
+    - name: "Install OpenVSwitch {{ovs_version}}"
       block:
         - name: Install OpenVSwitch dependencies
-          apt: 'name={{item}} state=present'
-          with_items:
-            - autoconf
-            - automake
-            - bzip2
-            - debhelper
-            - dh-autoreconf
-            - libssl-dev
-            - openssl
-            - pkg-config
-            - procps
-            - python-all
-            - python-qt4
-            - python-twisted-conch
-            - python-zopeinterface
+          apt:
+            name:
+              - autoconf
+              - automake
+              - bzip2
+              - debhelper
+              - dh-autoreconf
+              - libssl-dev
+              - openssl
+              - pkg-config
+              - procps
+              - python-all
+              - python-qt4
+              - python-twisted-conch
+              - python-zopeinterface
+            state: present
           become: true
-        - name: 'Fetch OpenVSwitch {{ovs_version}}'
+        - name: "Fetch OpenVSwitch {{ovs_version}}"
           get_url:
-            url: 'http://openvswitch.org/releases/openvswitch-{{ovs_version}}.tar.gz'
-            dest: '/tmp/openvswitch-{{ovs_version}}.tar.gz'
-            checksum: '{{ovs_checksum}}'
+            url: "http://openvswitch.org/releases/openvswitch-{{ovs_version}}.tar.gz"
+            dest: "/tmp/openvswitch-{{ovs_version}}.tar.gz"
+            checksum: "{{ovs_checksum}}"
         - name: Create /tmp/ovs directory
           file:
             path: /tmp/ovs
             state: directory
             mode: 0755
-        - name: 'Unarchive OpenVSwitch {{ovs_version}}'
+        - name: "Unarchive OpenVSwitch {{ovs_version}}"
           unarchive:
-            src: '/tmp/openvswitch-{{ovs_version}}.tar.gz'
+            src: "/tmp/openvswitch-{{ovs_version}}.tar.gz"
             dest: /tmp/ovs
             remote_src: true
-        - name: 'Build OpenVSwitch {{ovs_version}}'
+        - name: "Build OpenVSwitch {{ovs_version}}"
           shell: DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary
           args:
-            chdir: '/tmp/ovs/openvswitch-{{ovs_version}}'
-        - name: 'Install OpenVSwitch {{ovs_version}}'
-          apt: 'deb={{item}}'
+            chdir: "/tmp/ovs/openvswitch-{{ovs_version}}"
+        - name: "Install OpenVSwitch {{ovs_version}}"
+          apt: "deb={{item}}"
           with_items:
-            - /tmp/ovs/libopenvswitch_2.8.1-1_amd64.deb
-            - /tmp/ovs/openvswitch-common_2.8.1-1_amd64.deb
-            - /tmp/ovs/openvswitch-switch_2.8.1-1_amd64.deb
-            - /tmp/ovs/python-openvswitch_2.8.1-1_all.deb
-            - /tmp/ovs/openvswitch-vtep_2.8.1-1_amd64.deb
+            - /tmp/ovs/libopenvswitch_2.8.11-1_amd64.deb
+            - /tmp/ovs/openvswitch-common_2.8.11-1_amd64.deb
+            - /tmp/ovs/openvswitch-switch_2.8.11-1_amd64.deb
+            - /tmp/ovs/python-openvswitch_2.8.11-1_all.deb
+            - /tmp/ovs/openvswitch-vtep_2.8.11-1_amd64.deb
           become: true
         - name: Enable openvswitch-switch service
           systemd:
@@ -79,21 +80,22 @@
     - name: Install mtcbench
       block:
         - name: Install mtcbench dependencies
-          apt: 'name={{item}} state=present'
-          with_items:
-            - autoconf
-            - automake
-            - build-essential
-            - libconfig-dev
-            - libffi-dev
-            - libpcap-dev
-            - libsnmp-dev
-            - libtool
-            - libssl-doc
-            - make
-            - pkg-config
-            - snmp
-            - snmpd
+          apt:
+            name:
+              - autoconf
+              - automake
+              - build-essential
+              - libconfig-dev
+              - libffi-dev
+              - libpcap-dev
+              - libsnmp-dev
+              - libtool
+              - libssl-doc
+              - make
+              - pkg-config
+              - snmp
+              - snmpd
+            state: present
           become: true
         - name: Fetch mtcbench git repo
           git:
@@ -117,7 +119,7 @@
             dest: /usr/local/bin/cbench
             mode: 0755
             owner: root
-            remote_src: yes
+            remote_src: true
           become: true
 
     - name: Install exabgp
@@ -132,23 +134,16 @@
       apt: name=vlan state=present
       become: true
 
-    - name: Install Quagga
-      block:
-        - name: Fetch Quagga git repo
-          git:
-            repo: https://github.com/6WIND/zrpcd.git
-            dest: /tmp/build_quagga/zrpcd
-            version: 20170731
-        - name: Set compile script executable
-          file:
-            path: /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
-            mode: 0755
-        - name: Compile Quagga
-          shell: /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t
-          args:
-            chdir: /tmp/build_quagga/zrpcd
-            executable: /bin/bash
-          become: true
+    # This image is being used as a CSIT tools image and some of our
+    # CSIT test scripts are relying on python-2 and its request library.
+    # This makes sure we install them onto the image even though they
+    # are not required for the OVS rule of it.
+    - name: Install CSIT dependencies
+      apt:
+        name:
+          - python-requests
+        state: present
+      become: true
 
   post_tasks:
     - name: System Reseal