diff --git a/modules/rhizo_base/templates/osmo-bsc-bts.erb b/modules/rhizo_base/templates/osmo-bsc-bts.erb index 0f432cb..75b7ed1 100644 --- a/modules/rhizo_base/templates/osmo-bsc-bts.erb +++ b/modules/rhizo_base/templates/osmo-bsc-bts.erb @@ -25,8 +25,16 @@ neighbor-list mode automatic codec-support fr amr amr tch-f modes 4 5 + amr tch-f threshold ms 32 + amr tch-f hysteresis ms 8 + amr tch-f threshold bts 32 + amr tch-f hysteresis bts 8 amr tch-f start-mode 1 amr tch-h modes 4 5 + amr tch-h threshold ms 32 + amr tch-h hysteresis ms 8 + amr tch-h threshold bts 32 + amr tch-h hysteresis bts 8 amr tch-h start-mode 1 gprs mode <%= bts["gprs_m"] %> gprs routing area 21 diff --git a/modules/rhizo_base/templates/osmo-bsc-head.erb b/modules/rhizo_base/templates/osmo-bsc-head.erb index 1f3bd59..aac4a25 100644 --- a/modules/rhizo_base/templates/osmo-bsc-head.erb +++ b/modules/rhizo_base/templates/osmo-bsc-head.erb @@ -20,7 +20,6 @@ log stderr logging level ho notice logging level hodec notice logging level ref notice - logging level nat notice logging level ctrl notice logging level filter debug logging level pcu debug diff --git a/modules/rhizo_base/templates/osmo-bsc-tail.erb b/modules/rhizo_base/templates/osmo-bsc-tail.erb index 41e8cdb..9293dd5 100644 --- a/modules/rhizo_base/templates/osmo-bsc-tail.erb +++ b/modules/rhizo_base/templates/osmo-bsc-tail.erb @@ -1,7 +1,4 @@ msc 0 - no bsc-welcome-text - no bsc-msc-lost-text - no bsc-grace-text codec-list fr3 hr3 allow-emergency allow amr-config 12_2k forbidden @@ -20,7 +17,3 @@ msc 0 mgw remote-port 2427 bsc mid-call-timeout 0 - no missing-msc-text -cbc - no remote-ip - no listen-port diff --git a/modules/rhizo_base/templates/osmo-mgw.cfg.erb b/modules/rhizo_base/templates/osmo-mgw.cfg.erb index 67bb5a1..c8ca138 100644 --- a/modules/rhizo_base/templates/osmo-mgw.cfg.erb +++ b/modules/rhizo_base/templates/osmo-mgw.cfg.erb @@ -1,17 +1,56 @@ ! ! MGCP (UNKNOWN) configuration by puppet ! +log stderr + logging filter all 1 + logging color 0 + logging print category-hex 0 + logging print category 1 + logging timestamp 0 + logging print file 1 + logging level rtp notice + logging level e1 notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice + logging level ljibuf notice + logging level lrspro notice +! +stats interval 5 +! +line vty + no login +! mgcp - bind ip 127.0.0.1 - rtp port-range 4002 8001 - rtp bind-ip 172.16.0.1 - rtp ip-probing - rtp ip-tos 184 - bind port 2427 - number endpoints 31 - loop 0 - force-realloc 1 - rtcp-omit - rtp-patch ssrc - rtp-patch timestamp - rtp-accept-all 1 + domain mgw + bind ip 127.0.0.1 + bind port 2427 + rtp port-range 4002 8001 + rtp bind-ip 172.16.0.1 + rtp ip-probing + rtp ip-dscp 184 + rtp keep-alive once + rtcp-omit + rtp-patch ssrc + rtp-patch timestamp + no rtp-patch rfc5993hr + sdp audio-payload send-ptime + sdp audio-payload send-name + loop 0 + number endpoints 31 + allow-transcoding + osmux off diff --git a/modules/rhizo_base/templates/osmo-mgw2.cfg.erb b/modules/rhizo_base/templates/osmo-mgw2.cfg.erb index 5561cb5..c3087c2 100644 --- a/modules/rhizo_base/templates/osmo-mgw2.cfg.erb +++ b/modules/rhizo_base/templates/osmo-mgw2.cfg.erb @@ -1,19 +1,59 @@ ! ! MGCP (UNKNOWN) configuration by puppet ! -mgcp - bind ip 127.0.0.2 - rtp port-range 8002 10001 - rtp bind-ip 172.16.0.1 - rtp ip-probing - rtp ip-tos 184 - bind port 2428 - number endpoints 31 - loop 0 - force-realloc 1 - rtcp-omit - rtp-patch ssrc - rtp-patch timestamp - rtp-accept-all 1 +log stderr + logging filter all 1 + logging color 0 + logging print category-hex 0 + logging print category 1 + logging timestamp 0 + logging print file 1 + logging level rtp notice + logging level e1 notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice + logging level ljibuf notice + logging level lrspro notice +! +stats interval 5 +! line vty - bind 127.0.0.2 + no login + bind 127.0.0.2 +! +ctrl + bind 127.0.0.2 +mgcp + domain mgw + bind ip 127.0.0.2 + bind port 2428 + rtp port-range 8002 10001 + rtp bind-ip 172.16.0.1 + rtp ip-probing + rtp ip-dscp 184 + rtp keep-alive once + rtcp-omit + rtp-patch ssrc + rtp-patch timestamp + no rtp-patch rfc5993hr + sdp audio-payload send-ptime + sdp audio-payload send-name + loop 0 + number endpoints 31 + allow-transcoding + osmux off diff --git a/modules/rhizo_base/templates/osmo-stp.cfg.erb b/modules/rhizo_base/templates/osmo-stp.cfg.erb index c435681..28eedcb 100644 --- a/modules/rhizo_base/templates/osmo-stp.cfg.erb +++ b/modules/rhizo_base/templates/osmo-stp.cfg.erb @@ -5,15 +5,38 @@ log stderr logging filter all 1 logging color 1 + logging print category-hex 0 logging print category 1 - logging print level 1 logging timestamp 0 - logging level set-all notice + logging print level 1 + logging print file 1 + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice + logging level ljibuf notice + logging level lrspro notice +! +stats interval 5 +! line vty no login ! cs7 instance 0 xua rkm routing-key-allocation dynamic-permitted listen m3ua 2905 - accept-asp-connections dynamic-permitted local-ip :: + accept-asp-connections dynamic-permitted