Merge "Configure honeycomb NAT settings after vpp crash"

diff --git a/vnfs/vCPE/scripts/v_brgemu_init.sh b/vnfs/vCPE/scripts/v_brgemu_init.sh
index fdeb439..e969799 100644 (file)
--- a/vnfs/vCPE/scripts/v_brgemu_init.sh
+++ b/vnfs/vCPE/scripts/v_brgemu_init.sh
@@ -2,6 +2,4 @@
 
 systemctl start vpp
 systemctl start honeycomb
-
-/opt/bind_nic.sh
-/opt/set_nat.sh
+systemctl start nat

diff --git a/vnfs/vCPE/scripts/v_brgemu_install.sh b/vnfs/vCPE/scripts/v_brgemu_install.sh
index 0f2b06f..f8824f9 100755 (executable)
--- a/vnfs/vCPE/scripts/v_brgemu_install.sh
+++ b/vnfs/vCPE/scripts/v_brgemu_install.sh
@@ -197,7 +197,6 @@ EOF
 
     NICS=$(get_nic_pci_list)
     NICS=`echo ${NICS} | sed 's/[0]\+\([0-9]\)/\1/g' | sed 's/[.:]/\//g'`
-    echo $NICS
 
     BRG_BNG_NIC=GigabitEthernet`echo ${NICS} | cut -d " " -f 2`  # second interface in list
     echo $BRG_BNG_NIC > /opt/config/brg_nic.txt
@@ -330,6 +329,17 @@ EOF
     chmod +x /opt/set_nat.sh
 fi  # endif BUILD_STATE != "build"
 
+#Create script to run bind_nic.sh and set_nat.sh
+    cat > /opt/nat_service.sh << 'EOF'
+#! /bin/bash
+
+sleep 15
+/opt/bind_nic.sh
+/opt/set_nat.sh
+
+EOF
+    chmod +x /opt/nat_service.sh
+
 if [[ $BUILD_STATE != "done" ]]
 then
 
@@ -484,6 +494,24 @@ WantedBy=multi-user.target
 EOF
     systemctl enable /etc/systemd/system/honeycomb.service
 
+
+    # Create systemctl service for nat script
+    cat > /etc/systemd/system/nat.service << EOF
+[Unit]
+Description=Runs vbrg scripts for nat configuration
+Requires=vpp.service
+After=vpp.service
+
+[Service]
+RemainAfterExit=True
+ExecStart=/opt/nat_service.sh
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+EOF
+    systemctl enable /etc/systemd/system/nat.service
+
     # Download DHCP config files
     cd /opt
     wget $REPO_URL_BLOB/org.onap.demo/vnfs/vcpe/$INSTALL_SCRIPT_VERSION/v_brgemu_init.sh