mirror of https://gerrit.osmocom.org/osmo-dev
net/templates/run: one variable for stp4cn/stp4ran
Make it consistent with osmo-mgw and osmo-bsc where we also have more than one config, and the config is not part of the variable. Change-Id: I83301d75814070c29c6362c59fade9044aa2c0cc
This commit is contained in:
parent
641b4514f6
commit
bb0d4d3ebe
|
@ -199,8 +199,7 @@ ggsn="osmo-ggsn"
|
||||||
#mgw="strace osmo-mgw"
|
#mgw="strace osmo-mgw"
|
||||||
mgw="osmo-mgw"
|
mgw="osmo-mgw"
|
||||||
hlr="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-hlr --db-upgrade"
|
hlr="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-hlr --db-upgrade"
|
||||||
stp4cn="osmo-stp -c osmo-stp-cn.cfg"
|
stp="osmo-stp"
|
||||||
stp4ran="osmo-stp -c osmo-stp-ran.cfg"
|
|
||||||
bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc"
|
bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc"
|
||||||
bscnat="osmo-bsc-nat"
|
bscnat="osmo-bsc-nat"
|
||||||
bts="osmo-bts-virtual"
|
bts="osmo-bts-virtual"
|
||||||
|
@ -250,10 +249,10 @@ echo "$!" > "$PIDFILE_TCPDUMP_LO"
|
||||||
term "$ggsn" GGSN
|
term "$ggsn" GGSN
|
||||||
|
|
||||||
if [ "${STP_CN_IP}" = "${STP_RAN_IP}" ]; then
|
if [ "${STP_CN_IP}" = "${STP_RAN_IP}" ]; then
|
||||||
term "$stp4cn" STP
|
term "$stp -c osmo-stp-cn.cfg" STP
|
||||||
else
|
else
|
||||||
term "$stp4cn" STP4CN
|
term "$stp -c osmo-stp-cn.cfg" STP4CN
|
||||||
term "$stp4ran" STP4RAN
|
term "$stp -c osmo-stp-ran.cfg" STP4RAN
|
||||||
term "$mgw -c osmo-mgw-for-bsc-nat.cfg" MGW4BSCNAT
|
term "$mgw -c osmo-mgw-for-bsc-nat.cfg" MGW4BSCNAT
|
||||||
term "$bscnat" BSCNAT
|
term "$bscnat" BSCNAT
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue