X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fnat_osm;h=e12a123f95e372af36bf4685ee6f1d1c85ec5017;hb=021b307297a6ab8dfe9ee3af03154989bcd9e0e8;hp=ab0e1e1cd9c9bfda6b4acef5886aacc24fbf366a;hpb=4a98a04ff0ceb544ca7f5f9033d5633dea7ab092;p=osm%2Fdevops.git

diff --git a/installers/nat_osm b/installers/nat_osm
index ab0e1e1c..e12a123f 100755
--- a/installers/nat_osm
+++ b/installers/nat_osm
@@ -36,8 +36,7 @@ usage(){
 
 HERE=$(realpath $(dirname $0))
 OSM_DEVOPS=$(dirname $HERE)
-OSM_JENKINS="$OSM_DEVOPS/jenkins"
-. $OSM_JENKINS/common/all_funcs
+. $OSM_DEVOPS/common/all_funcs
 
 #Get default IP address
 . $OSM_DEVOPS/installers/export_ips
@@ -88,13 +87,8 @@ done
 echo
 echo "*** Configuring iptables rules ***"
 
-<<<<<<< HEAD
-awk -v RO_IP="$RO_IP" -v VCA_IP="$VCA_IP" -v UI_IP="$UI_IP" -v openmano_ip="$RO_CONTAINER_IP" -v rift_ip="$SO_CONTAINER_IP" -v juju_ip="$VCA_CONTAINER_IP" '
-BEGIN {innat=0; innatpre=0; osmpre=0; donepre=0; innatpost=0; osmpost=0; donepost=0; innatoutput=0; osmoutput=0; doneoutput=0;}
-=======
 awk -v RO_IP="$RO_IP" -v VCA_IP="$VCA_IP" -v UI_IP="$UI_IP" -v openmano_ip="$RO_CONTAINER_IP" -v MON_IP="$MON_IP" -v rift_ip="$SO_CONTAINER_IP" -v juju_ip="$VCA_CONTAINER_IP" '
 BEGIN {innat=0; innatpre=0; osmpre=0; donepre=0; innatpost=0; osmpost=0; donepost=0}
->>>>>>> MON Installation Changes Updated.
 /^\*nat/ {
     innat=1;
     print;