From d38fc2895fba1fe04d7f8c0d41373ffe42c14fab Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 6 Mar 2018 13:09:39 +0000 Subject: [PATCH] CSIT-988: Add libmbedcrypto0 as a new vpp dependency Add libmbedcrypto0 to the list of installed packages on Physical testbeds + VIRL images Change-Id: Ied68b79a36d0b6c8619aa22effeac30e5f3c0cf6 Signed-off-by: Peter Mikus --- resources/tools/disk-image-builder/centos/run-listmaker.sh | 2 +- resources/tools/disk-image-builder/ubuntu/CHANGELOG | 4 ++++ resources/tools/disk-image-builder/ubuntu/run-listmaker.sh | 2 +- resources/tools/testbed-setup/playbooks/01-host-setup.yaml | 8 +++++++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/resources/tools/disk-image-builder/centos/run-listmaker.sh b/resources/tools/disk-image-builder/centos/run-listmaker.sh index 2cc0ec0302..24463c48da 100755 --- a/resources/tools/disk-image-builder/centos/run-listmaker.sh +++ b/resources/tools/disk-image-builder/centos/run-listmaker.sh @@ -63,7 +63,7 @@ echo "Storing data in ${OUTPUT_DIR}/." RPM_WANTLIST_INFRA="nfs-utils cloud-init pkgconfig yum-utils" RPM_WANTLIST_CSIT="python-devel python-pip python-virtualenv python-setuptools python-pip openssl-devel git strongswan" RPM_WANTLIST_TLDK="tcpdump" -RPM_WANTLIST_VPP="dkms bridge-utils" +RPM_WANTLIST_VPP="dkms bridge-utils libmbedcrypto0 libmbedtls10 libmbedx509-0" RPM_WANTLIST_TREX="zlib-devel unzip" RPM_WANTLIST_MISC="socat psmisc gperftools glusterfs glusterfs-api libiscsi libibverbs libpcap libpcap-devel pixman libpng pulseaudio-libs librados2 librbd1 librdmacm libseccomp spice-server libusb usbredir glusterfs-devel seavgabios-bin sgabios-bin ipxe-roms-qemu nss-devel seabios-bin" diff --git a/resources/tools/disk-image-builder/ubuntu/CHANGELOG b/resources/tools/disk-image-builder/ubuntu/CHANGELOG index 1a8c56df80..6dfcacc669 100644 --- a/resources/tools/disk-image-builder/ubuntu/CHANGELOG +++ b/resources/tools/disk-image-builder/ubuntu/CHANGELOG @@ -1,3 +1,7 @@ +## [2.1] - 2018-03-07 + +Added libmbedcrypto0 libmbedtls10 libmbedx509-0 + ## [2.0] - 2017-09-22 Moved IPv6_disable from GRUB boot params to sysctl diff --git a/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh b/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh index 454fe47d32..7f5311ed23 100755 --- a/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh +++ b/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh @@ -64,7 +64,7 @@ echo "Storing data in ${OUTPUT_DIR}/." APT_WANTLIST_INFRA="nfs-common cloud-init" APT_WANTLIST_CSIT="python-dev python-pip python-virtualenv git strongswan socat" APT_WANTLIST_TLDK="libpcap0.8-dev libpcap-dev cmake tcpdump" -APT_WANTLIST_VPP="dkms bridge-utils" +APT_WANTLIST_VPP="dkms bridge-utils libmbedcrypto0 libmbedtls10 libmbedx509-0" APT_WANTLIST_TREX="zlib1g-dev unzip" APT_WANTLIST_NESTED="qemu-system-x86" APT_WANTLIST_JAVA="openjdk-8-jdk-headless" diff --git a/resources/tools/testbed-setup/playbooks/01-host-setup.yaml b/resources/tools/testbed-setup/playbooks/01-host-setup.yaml index 7333885127..90a5ad7899 100644 --- a/resources/tools/testbed-setup/playbooks/01-host-setup.yaml +++ b/resources/tools/testbed-setup/playbooks/01-host-setup.yaml @@ -142,6 +142,12 @@ apt: name=libtool state=present - name: Install screen apt: name=screen state=present + - name: Install libmbedcrypto0 + apt: name=libmbedcrypto0 state=present + - name: Install libmbedtls10 + apt: name=libmbedtls10 state=present + - name: Install libmbedx509-0 + apt: name=libmbedx509-0 state=present - name: Install lxc apt: name=lxc state=present - name: Disable 80-vpp.conf @@ -172,4 +178,4 @@ - name: Install Kubernetes kubelet apt: name=kubelet state=present - name: Install Kubernetes kubeadm - apt: name=kubeadm state=present + apt: name=kubeadm state=present \ No newline at end of file -- 2.16.6