diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2016-10-19 23:22:50 -0400 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2016-10-19 23:22:50 -0400 |
| commit | 68f634986a6228a0ab679acce3d3c4187ba97600 (patch) | |
| tree | 227d9cde8375432c3f1db6e4e5bcd38333929f11 | |
| parent | d3e6dcd6e335ab53d7aea25e0813449ca61cb8bb (diff) | |
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>
| -rw-r--r-- | resources/tools/testbed-setup/playbooks/01-host-setup.yaml | 2 | ||||
| -rw-r--r-- | 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 4a117943a1..7158ce2428 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: 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 9373e4aba4..65733f9caf 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 -- 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 @@ -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 -- 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 |