Merge "Move unimgr Sonar scan to Sonarcloud"

[releng/builder.git] / packer / provision / mininet-ovs-2.8.yaml

diff --git a/packer/provision/mininet-ovs-2.8.yaml b/packer/provision/mininet-ovs-2.8.yaml
index e85baf21ef71ba49af618c11904324726ac255bf..06dc8c011a323c4a7babdbfd809357dfc45962b2 100644 (file)
--- a/packer/provision/mininet-ovs-2.8.yaml
+++ b/packer/provision/mininet-ovs-2.8.yaml
@@ -9,27 +9,28 @@
     ovs_version: 2.8.1
 
   pre_tasks:
-    - include_role: name=system-update
+    - include_role: name=lfit.system-update
 
   tasks:
     - 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}}'
           get_url:
@@ -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
+    - name: Install CSIT dependencies
+      apt:
+        name:
+          - git-review
+          - python-chardet
+          - python-ndg-httpsclient
+          - python-requests
+          - python-urllib3
+        state: present
+      become: true
 
   post_tasks:
     - name: System Reseal