From ac03cfe5a4b9f0b581186d49f5cac8781dfc5805 Mon Sep 17 00:00:00 2001 From: Keith Whyte Date: Fri, 13 Nov 2020 07:23:04 +0100 Subject: [PATCH] Osmocom configs: Fix compatability with latest release --- modules/rhizo_base/templates/osmo-bsc-bts.erb | 3 ++- modules/rhizo_base/templates/osmo-mgw.cfg.erb | 1 - modules/rhizo_base/templates/osmo-mgw2.cfg.erb | 3 ++- modules/rhizo_base/templates/osmo-msc.cfg.erb | 4 ++-- modules/rhizo_base/templates/osmo-stp.cfg.erb | 3 ++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/rhizo_base/templates/osmo-bsc-bts.erb b/modules/rhizo_base/templates/osmo-bsc-bts.erb index d2c490f..6b9b4c5 100644 --- a/modules/rhizo_base/templates/osmo-bsc-bts.erb +++ b/modules/rhizo_base/templates/osmo-bsc-bts.erb @@ -17,7 +17,6 @@ channel-description bs-pa-mfrms 5 channel-description bs-ag-blks-res 1 no access-control-class-ramping - access-control-class-ramping-step-size 1 early-classmark-sending forbidden early-classmark-sending-3g allowed ipa unit-id 1000 <%= bts["uid"] %> @@ -67,6 +66,8 @@ gprs nsvc 1 local udp port 0 gprs nsvc 1 remote udp port 0 gprs nsvc 1 remote ip 0.0.0.0 +<% if @repo == 'nightly' && bts["gprs_m"] == "egprs" %> gprs egprs-packet-channel-request +<% end -%> no force-combined-si <% if bts["model"] == "2050S" %> depends-on-bts <%= index-1 %> <% end -%> diff --git a/modules/rhizo_base/templates/osmo-mgw.cfg.erb b/modules/rhizo_base/templates/osmo-mgw.cfg.erb index c8ca138..8c38bba 100644 --- a/modules/rhizo_base/templates/osmo-mgw.cfg.erb +++ b/modules/rhizo_base/templates/osmo-mgw.cfg.erb @@ -9,7 +9,6 @@ log stderr 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 diff --git a/modules/rhizo_base/templates/osmo-mgw2.cfg.erb b/modules/rhizo_base/templates/osmo-mgw2.cfg.erb index c3087c2..16e6ad4 100644 --- a/modules/rhizo_base/templates/osmo-mgw2.cfg.erb +++ b/modules/rhizo_base/templates/osmo-mgw2.cfg.erb @@ -9,7 +9,6 @@ log stderr 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 @@ -36,8 +35,10 @@ line vty no login bind 127.0.0.2 ! +<% if @repo == 'nightly' -%> ctrl bind 127.0.0.2 +<% end -%> mgcp domain mgw bind ip 127.0.0.2 diff --git a/modules/rhizo_base/templates/osmo-msc.cfg.erb b/modules/rhizo_base/templates/osmo-msc.cfg.erb index d6cc169..2b43d06 100644 --- a/modules/rhizo_base/templates/osmo-msc.cfg.erb +++ b/modules/rhizo_base/templates/osmo-msc.cfg.erb @@ -66,13 +66,13 @@ network rrlp mode none mm info 1 msc - sms-database <%= @sms_db %> +<% if @repo == 'nightly' -%> sms-database <%= @sms_db %> +<% end -%> mncc external /tmp/bsc_mncc mncc guard-timeout 180 ncss guard-timeout 30 no assign-tmsi cs7-instance-a 0 - cs7-instance-iu 0 auth-tuple-max-reuse-count 3 auth-tuple-reuse-on-error 1 check-imei-rqd early diff --git a/modules/rhizo_base/templates/osmo-stp.cfg.erb b/modules/rhizo_base/templates/osmo-stp.cfg.erb index 28eedcb..ec220ad 100644 --- a/modules/rhizo_base/templates/osmo-stp.cfg.erb +++ b/modules/rhizo_base/templates/osmo-stp.cfg.erb @@ -38,5 +38,6 @@ line vty cs7 instance 0 xua rkm routing-key-allocation dynamic-permitted listen m3ua 2905 - local-ip :: +<% if @repo == 'nightly' -%> local-ip :: +<% end -%> accept-asp-connections dynamic-permitted