X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fnat_osm;h=466855d2e4e639d97f2cb9173f3bbe80d6b0e184;hb=d5cec9dbcd80484e0748fcdee8df33d9b94825ff;hp=cacec22cc4f24d9040e61eaeb872e22fa62261b6;hpb=93c61317d93d143b1d1a175ace2975f45bb1076e;p=osm%2Fdevops.git

diff --git a/installers/nat_osm b/installers/nat_osm
index cacec22c..466855d2 100755
--- a/installers/nat_osm
+++ b/installers/nat_osm
@@ -35,7 +35,8 @@ usage(){
 
 HERE=$(realpath $(dirname $0))
 OSM_DEVOPS=$(dirname $HERE)
-. $OSM_DEVOPS/jenkins/common/all_funcs
+OSM_JENKINS="$OSM_DEVOPS/jenkins"
+. $OSM_JENKINS/common/all_funcs
 
 #Get default IP address
 . $OSM_DEVOPS/installers/export_ips
@@ -105,8 +106,10 @@ osmpre==1 && /#End autogeneration by nat_osm/ {
     print "#Autogenerated by nat_osm"
     print "-A PREROUTING -d "RO_IP" -p tcp -m tcp --dport 9090 -j DNAT --to-destination "openmano_ip
     print "-A PREROUTING -d "UI_IP" -p tcp -m tcp --dport 8000 -j DNAT --to-destination "rift_ip
-    print "-A PREROUTING -d "UI_IP" -p tcp -m tcp --dport 4567 -j DNAT --to-destination "rift_ip
     print "-A PREROUTING -d "UI_IP" -p tcp -m tcp --dport 8443 -j DNAT --to-destination "rift_ip
+    print "-A PREROUTING -d "UI_IP" -p tcp -m tcp --dport 8008 -j DNAT --to-destination "rift_ip
+    print "-A PREROUTING -d "UI_IP" -p tcp -m tcp --dport 8009 -j DNAT --to-destination "rift_ip
+    print "-A PREROUTING -d "UI_IP" -p tcp -m tcp --dport 80 -j DNAT --to-destination "rift_ip
     #print "-A PREROUTING -d "VCA_IP" -p tcp -m tcp --dport 443 -j DNAT --to-destination "juju_ip
     #print "-A PREROUTING -d "VCA_IP" -p tcp -m tcp --dport 17070 -j DNAT --to-destination "juju_ip
     print "#End autogeneration by nat_osm"
@@ -121,8 +124,10 @@ innatpre==1 && /\:INPUT/ {
         print "#Autogenerated by nat_osm"
         print "-A PREROUTING -d "RO_IP" -p tcp -m tcp --dport 9090 -j DNAT --to-destination "openmano_ip
         print "-A PREROUTING -d "UI_IP" -p tcp -m tcp --dport 8000 -j DNAT --to-destination "rift_ip
-        print "-A PREROUTING -d "UI_IP" -p tcp -m tcp --dport 4567 -j DNAT --to-destination "rift_ip
         print "-A PREROUTING -d "UI_IP" -p tcp -m tcp --dport 8443 -j DNAT --to-destination "rift_ip
+        print "-A PREROUTING -d "UI_IP" -p tcp -m tcp --dport 8008 -j DNAT --to-destination "rift_ip
+        print "-A PREROUTING -d "UI_IP" -p tcp -m tcp --dport 8009 -j DNAT --to-destination "rift_ip
+        print "-A PREROUTING -d "UI_IP" -p tcp -m tcp --dport 80 -j DNAT --to-destination "rift_ip
         #print "-A PREROUTING -d "VCA_IP" -p tcp -m tcp --dport 443 -j DNAT --to-destination "juju_ip
         #print "-A PREROUTING -d "VCA_IP" -p tcp -m tcp --dport 17070 -j DNAT --to-destination "juju_ip
         print "#End autogeneration by nat_osm"
@@ -142,10 +147,11 @@ innatpost==1 && /\#Autogenerated by nat_osm/ {
     next;
 }
 osmpost==1 && /#End autogeneration by nat_osm/ {
-    #print "#Autogenerated by nat_osm"
+    print "#Autogenerated by nat_osm"
+    print "-A POSTROUTING -s "rift_ip"/24 -d "rift_ip" -p tcp --dport 8443 -j MASQUERADE"
     #print "-A POSTROUTING -s "rift_ip" -p tcp -m tcp --dport 9090 -d "openmano_ip" -j SNAT --to "UI_IP
     #print "-A POSTROUTING -s "rift_ip" -p tcp -m tcp --dport 17070 -d "juju_ip" -j SNAT --to "UI_IP
-    #print "#End autogeneration by nat_osm"
+    print "#End autogeneration by nat_osm"
     osmpost=0;
     donepost=1;
     next;
@@ -155,10 +161,11 @@ innatpost==1 && /COMMIT/ {
     innatpost=0;
     innat=0;
     if (donepost==0) {
-        #print "#Autogenerated by nat_osm"
+        print "#Autogenerated by nat_osm"
+        print "-A POSTROUTING -s "rift_ip"/24 -d "rift_ip" -p tcp --dport 8443 -j MASQUERADE"
         #print "-A POSTROUTING -s "rift_ip" -p tcp -m tcp --dport 9090 -d "openmano_ip" -j SNAT --to "UI_IP
         #print "-A POSTROUTING -s "rift_ip" -p tcp -m tcp --dport 17070 -d "juju_ip" -j SNAT --to "UI_IP
-        #print "#End autogeneration by nat_osm"
+        print "#End autogeneration by nat_osm"
         donepost=1;
     }
     print;