From: Srivahni <srivahni.chivukula@intel.com>
Date: Thu, 4 Jan 2018 02:12:37 +0000 (-0800)
Subject: Fixed DHCP server problem
X-Git-Tag: v1.2.0~150
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=43c1bd32b83541a3e83545432e761e758c0c6f4b;p=demo.git

Fixed DHCP server problem

Moved DHCP server installation to the build phase of the
deployment to eliminate the problem of it going
down sometimes.

Change-Id: I7a5db7aacb57600fe14b1cae9d10caab1593b24e
Issue-ID: INT-63
Signed-off-by: Srivahni <srivahni.chivukula@intel.com>
---

diff --git a/vnfs/vCPE/scripts/v_gw_install.sh b/vnfs/vCPE/scripts/v_gw_install.sh
index 53ac6903..6d3f6d8c 100644
--- a/vnfs/vCPE/scripts/v_gw_install.sh
+++ b/vnfs/vCPE/scripts/v_gw_install.sh
@@ -70,6 +70,9 @@ then
     # Install the tools required for download codes
     apt-get --allow-unauthenticated install -y expect git make linux-image-extra-`uname -r`
 
+    #Install DHCP server
+    apt-get install -y isc-dhcp-server
+
     #Download and build the VPP codes
     cd /opt
     git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_BRANCH} vpp
@@ -385,8 +388,7 @@ WantedBy=multi-user.target
 EOF
     systemctl enable /etc/systemd/system/honeycomb.service
 
-    # Install the DHCP server and config
-    apt-get install -y isc-dhcp-server
+    # DHCP server config
     cat >> /etc/dhcp/dhcpd.conf << EOF
 subnet 192.168.1.0 netmask 255.255.255.0 {
   range 192.168.1.2 192.168.1.253;