summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-03-15 20:54:51 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-15 20:54:51 +0000
commit2dea739e3ac5baf1bf247cfbf080527981b42aa0 (patch)
tree5fca5b200daddc6ef1805470871b8aaa45eb5b0f
parentcf72f80710c8323aedd3fb209abd41522599b3d2 (diff)
parentb72e6fef8f43edefbc34e458b5a87218363ee658 (diff)
Merge "Remove 80-vpp.conf for odl_l2-fdio scenario"
-rwxr-xr-xlib/overcloud-deploy-functions.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 4d4b7647..02145bed 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -198,6 +198,7 @@ EOI
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight vpp vpp-devel vpp-api-python vpp-lib vpp-plugins honeycomb" \
--run-command "yum -y install /root/fdio_l2/*.rpm" \
+ --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \
-a overcloud-full.qcow2
EOI
fi