CSIT-351 Revert "VPP base package fails to load on VIRL 16.04 SUTs"

Change-Id: Ice0246fb91faf215f5e19be92d6aca7c9f376586
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

diff --git a/resources/tools/testbed-setup/playbooks/01-host-setup.yaml b/resources/tools/testbed-setup/playbooks/01-host-setup.yaml
index 4a11794..7158ce2 100644 (file)
--- 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
   - name: Install libtool
     apt: name=libtool state=present
   - name: Disable 80-vpp.conf

-    command: rm -f /etc/sysctl.d/80-vpp.conf
+    command: ln -s /dev/null /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 9373e4a..65733f9 100644 (file)
--- 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
 - 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

-- rm -f /etc/sysctl.d/80-vpp.conf
+- ln -s /dev/null /etc/sysctl.d/80-vpp.conf

 users:
 - default
 - gecos: User configured by VIRL Configuration Engine 0.21.4
 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
 - 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

-- rm -f /etc/sysctl.d/80-vpp.conf
+- ln -s /dev/null /etc/sysctl.d/80-vpp.conf

 users:
 - default
 - gecos: User configured by VIRL Configuration Engine 0.21.4
 users:
 - default
 - gecos: User configured by VIRL Configuration Engine 0.21.4