From 91e3d977f9f4e2c1c5e09fd406669b49847883db Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Mon, 17 Oct 2016 22:30:13 -0400 Subject: [PATCH] CSIT-351: VPP base package fails to load on VIRL 16.04 SUTs Change-Id: If33008da9d0b1376b840a6533f4f57af44e3340a Signed-off-by: Dave Wallace --- resources/tools/testbed-setup/playbooks/01-host-setup.yaml | 2 +- resources/tools/virl/topologies/double-ring-nested.xenial.virl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/tools/testbed-setup/playbooks/01-host-setup.yaml b/resources/tools/testbed-setup/playbooks/01-host-setup.yaml index 7158ce2428..4a117943a1 100644 --- a/resources/tools/testbed-setup/playbooks/01-host-setup.yaml +++ b/resources/tools/testbed-setup/playbooks/01-host-setup.yaml @@ -92,4 +92,4 @@ - name: Install libtool apt: name=libtool state=present - name: Disable 80-vpp.conf - command: ln -s /dev/null /etc/sysctl.d/80-vpp.conf + command: rm -f /etc/sysctl.d/80-vpp.conf diff --git a/resources/tools/virl/topologies/double-ring-nested.xenial.virl b/resources/tools/virl/topologies/double-ring-nested.xenial.virl index 65733f9caf..9373e4aba4 100644 --- a/resources/tools/virl/topologies/double-ring-nested.xenial.virl +++ b/resources/tools/virl/topologies/double-ring-nested.xenial.virl @@ -121,7 +121,7 @@ runcmd: - service sshd restart - sed -i 's/no-pci//' /opt/cisco/vpe/etc/qn.conf - sed -i 's/1024/1024 decimal-interface-names/g' /opt/cisco/vpe/etc/qn.conf -- ln -s /dev/null /etc/sysctl.d/80-vpp.conf +- rm -f /etc/sysctl.d/80-vpp.conf users: - default - gecos: User configured by VIRL Configuration Engine 0.21.4 @@ -246,7 +246,7 @@ runcmd: - service sshd restart - sed -i 's/no-pci//' /opt/cisco/vpe/etc/qn.conf - sed -i 's/1024/1024 decimal-interface-names/g' /opt/cisco/vpe/etc/qn.conf -- ln -s /dev/null /etc/sysctl.d/80-vpp.conf +- rm -f /etc/sysctl.d/80-vpp.conf users: - default - gecos: User configured by VIRL Configuration Engine 0.21.4 -- 2.16.6