Merge "Remove depricated flags and add fix missing"

diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index 8a9971f78ec93db84515067a0603d175c89b33ad..5a97699467aab83610b1021ff219886edaee0f4d 100644 (file)
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -183,6 +183,7 @@ EOF
         do
             # shellcheck disable=SC2046
             if [ $(dpkg-query -W -f='${Status}' $pkg 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
+                apt-cache policy $pkg
                 apt-get install $pkg
             fi
         done

diff --git a/packer/provision/mininet-ovs-2.5.sh b/packer/provision/mininet-ovs-2.5.sh
index 1702c8fe2cd5b015b1bf03bd748f8843bef43393..5f392cf8a15c69c97839144fa0edd6bb26d0e19b 100644 (file)
--- a/packer/provision/mininet-ovs-2.5.sh
+++ b/packer/provision/mininet-ovs-2.5.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # vim: sw=4 ts=4 sts=4 et tw=72 :
 
@@ -15,16 +15,15 @@ export DEBIAN_FRONTEND=noninteractive
 # ups
 echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
 
-# remove all force-yes with --allow*
 echo '---> Install OpenVSwitch 2.5.0'
-apt-get update -y --force-yes
-apt-get install -y --force-yes openvswitch-switch openvswitch-vtep
+apt-get update -m
+apt-get install openvswitch-switch openvswitch-vtep
 
 echo '---> Installing mininet'
-apt-get install -y --force-yes mininet
+apt-get install mininet
 
 echo '---> Installing build pre-requisites'
-apt-get install -y --force-yes build-essential snmp libsnmp-dev snmpd libpcap-dev \
+apt-get install build-essential snmp libsnmp-dev snmpd libpcap-dev \
 autoconf make automake libtool libconfig-dev libssl-dev libffi-dev libssl-doc pkg-config
 
 git clone https://github.com/intracom-telecom-sdn/mtcbench.git
@@ -38,13 +37,13 @@ make
 cp cbench /usr/local/bin/
 
 echo '---> Installing exabgp'
-apt-get install -y --force-yes exabgp
+apt-get install exabgp
 
 echo '---> All Python package installation should happen in virtualenv'
-apt-get install -y --force-yes python-virtualenv python-pip
+apt-get install python-virtualenv python-pip
 
 # Install vlan for vlan based tests in VTN suites
-apt-get install -y --force-yes -qq vlan
+apt-get install vlan
 
 # Install netaddr package which is needed by some custom mininet topologies
-apt-get install -y --force-yes -qq python-netaddr
+apt-get install python-netaddr