From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Wed, 4 Apr 2018 14:05:42 +0000 (-0400)
Subject: fix merge issue
X-Git-Tag: v3.1.0~29
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=5a470344853c99a5bb291d22558cb917fdd88e3b;hp=4a98a04ff0ceb544ca7f5f9033d5633dea7ab092;p=osm%2Fdevops.git

fix merge issue

Change-Id: Ia31df08f51c7b20cb8ecfaf61b9ab6904ddd4f16
Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
---

diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index 7416dabf..4cd797a1 100755
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -257,12 +257,8 @@ function configure_RO(){
     ro_is_up
 
     lxc exec RO -- openmano tenant-delete -f osm >/dev/null
-<<<<<<< HEAD
     lxc exec RO -- openmano tenant-create osm > /dev/null
-    lxc exec RO -- sed -i '/export OPENMANO_TENANT=osm/d' .bashrc 
-=======
     lxc exec RO -- sed -i '/export OPENMANO_TENANT=osm/d' .bashrc
->>>>>>> MON Installation Changes Updated.
     lxc exec RO -- sed -i '$ i export OPENMANO_TENANT=osm' .bashrc
     lxc exec RO -- sh -c 'echo "export OPENMANO_TENANT=osm" >> .bashrc'
 }
diff --git a/installers/nat_osm b/installers/nat_osm
index ab0e1e1c..b7b70970 100755
--- a/installers/nat_osm
+++ b/installers/nat_osm
@@ -88,13 +88,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;