projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix logs before removing repo
[osm/devops.git]
/
installers
/
nat_osm
diff --git
a/installers/nat_osm
b/installers/nat_osm
index
eb6a18f
..
e12a123
100755
(executable)
--- a/
installers/nat_osm
+++ b/
installers/nat_osm
@@
-23,6
+23,7
@@
usage(){
echo -e " -u: UI/SO (rift) IP address"
echo -e " -r: RO (openmano) IP address"
echo -e " -v: VCA (juju) IP address"
echo -e " -u: UI/SO (rift) IP address"
echo -e " -r: RO (openmano) IP address"
echo -e " -v: VCA (juju) IP address"
+ echo -e " -m: MON IP address"
echo -e " -h: show this help"
}
echo -e " -h: show this help"
}
@@
-35,8
+36,7
@@
usage(){
HERE=$(realpath $(dirname $0))
OSM_DEVOPS=$(dirname $HERE)
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
#Get default IP address
. $OSM_DEVOPS/installers/export_ips
@@
-44,6
+44,7
@@
OSM_JENKINS="$OSM_DEVOPS/jenkins"
UI_IP=$DEFAULT_IP
RO_IP=$DEFAULT_IP
VCA_IP=$DEFAULT_IP
UI_IP=$DEFAULT_IP
RO_IP=$DEFAULT_IP
VCA_IP=$DEFAULT_IP
+MON_IP=$DEFAULT_IP
#read input options
while getopts ":u:r:v:h-:" o; do
#read input options
while getopts ":u:r:v:h-:" o; do
@@
-86,8
+87,8
@@
done
echo
echo "*** Configuring iptables rules ***"
echo
echo "*** Configuring iptables rules ***"
-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}
/^\*nat/ {
innat=1;
print;
/^\*nat/ {
innat=1;
print;