Osmocom configs: Fix compatability with latest release

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 -%>

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

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

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

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