From: Feng Pan <fpan@redhat.com>
Date: Tue, 14 Mar 2017 17:19:24 +0000 (-0400)
Subject: Remove 80-vpp.conf for odl_l2-fdio scenario
X-Git-Tag: opnfv-5.0.0~196^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F55%2F30455%2F1;p=apex.git

Remove 80-vpp.conf for odl_l2-fdio scenario

We remove and reinstall VPP package for odl_l2-fdio scenario, but
we never removed 80-vpp.conf file during the reinstall, causing
hugepage always being set to 1024.

JIRA: APEX-399

Change-Id: Ifda525517318e4797e4f7809730602ca59b7b6bc
Signed-off-by: Feng Pan <fpan@redhat.com>
---

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