From 65715ea60f1ef061f3e514bb5ee9c6f4a08501d9 Mon Sep 17 00:00:00 2001
From: "Wile E. Coyote" <rhizomatica@rhizomatica.org>
Date: Sat, 10 Feb 2018 20:42:40 +0000
Subject: [PATCH] Add GPRS config option, remove Riak management

---
 modules/rhizo_base/manifests/init.pp          |  9 +++--
 modules/rhizo_base/manifests/openbsc.pp       |  1 +
 modules/rhizo_base/manifests/riak.pp          |  2 +-
 .../rhizo_base/templates/osmo-nitb.cfg.erb    | 40 ++++++++++++++++++-
 4 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp
index faafb76..24f9f8c 100644
--- a/modules/rhizo_base/manifests/init.pp
+++ b/modules/rhizo_base/manifests/init.pp
@@ -39,7 +39,8 @@ class rhizo_base {
   $network_name    = hiera('rhizo::network_name')
   $auth_policy     = hiera('rhizo::auth_policy')
   $lac             = hiera('rhizo::lac')
-
+  $gprs             = hiera('rhizo::gprs')
+  
   #BTSs configuration
   $bts_type        = hiera('rhizo::bts_type')
   $bts1_ip_address = hiera('rhizo::bts1_ip_address')
@@ -174,10 +175,10 @@ class rhizo_base {
           group   => 'root',
           mode    => '0755',
           source  => 'puppet:///modules/rhizo_base/etc/init.d/riak',
-          require => Class['::riak'],
-          notify  => Exec['insserv'],
+          #require => Class['::riak'],
+          #notify  => Exec['insserv'],
         }
-        include rhizo_base::riak
+        #include rhizo_base::riak
     }
   } else {
       file { '/etc/init.d/riak':
diff --git a/modules/rhizo_base/manifests/openbsc.pp b/modules/rhizo_base/manifests/openbsc.pp
index fc8c58b..d19ccb7 100644
--- a/modules/rhizo_base/manifests/openbsc.pp
+++ b/modules/rhizo_base/manifests/openbsc.pp
@@ -24,6 +24,7 @@ class rhizo_base::openbsc {
   $bts2_ip_address = $rhizo_base::bts2_ip_address
   $bts3_ip_address = $rhizo_base::bts3_ip_address
   $smsc_password   = $rhizo_base::smsc_password
+  $gprs            = $rhizo_base::gprs
 
   package { [ 'libosmoabis5', 'libosmocore8',
               'libosmoctrl0', 'libosmogsm7',
diff --git a/modules/rhizo_base/manifests/riak.pp b/modules/rhizo_base/manifests/riak.pp
index a2daff9..06b7f5c 100644
--- a/modules/rhizo_base/manifests/riak.pp
+++ b/modules/rhizo_base/manifests/riak.pp
@@ -23,7 +23,7 @@ class rhizo_base::riak {
   class { '::riak':
       package_name   => 'riak',   # default
       service_name   => 'riak',   # default
-      manage_package => true,     # default
+      manage_package => false,     # default
       manage_repo    => false,
       version        => 'latest', # default, use a package version if desired
       # settings in the settings hash are written directly to settings.conf.
diff --git a/modules/rhizo_base/templates/osmo-nitb.cfg.erb b/modules/rhizo_base/templates/osmo-nitb.cfg.erb
index 0ab5d09..fb9ccd4 100644
--- a/modules/rhizo_base/templates/osmo-nitb.cfg.erb
+++ b/modules/rhizo_base/templates/osmo-nitb.cfg.erb
@@ -99,8 +99,36 @@ network
   oml ip.access stream_id 255 line 0
   neighbor-list mode automatic
   codec-support fr
-  gprs mode none
-  no force-combined-si
+  <% if @gprs == 'active' -%>gprs mode gprs
+  gprs 11bit_rach_support_for_egprs 0
+  gprs routing area 0
+  gprs network-control-order nc0
+  gprs cell bvci 2
+  gprs cell timer blocking-timer 3
+  gprs cell timer blocking-retries 3
+  gprs cell timer unblocking-retries 3
+  gprs cell timer reset-timer 3
+  gprs cell timer reset-retries 3
+  gprs cell timer suspend-timer 10
+  gprs cell timer suspend-retries 3
+  gprs cell timer resume-timer 10
+  gprs cell timer resume-retries 3
+  gprs cell timer capability-update-timer 10
+  gprs cell timer capability-update-retries 3
+  gprs nsei 951
+  gprs ns timer tns-block 3
+  gprs ns timer tns-block-retries 3
+  gprs ns timer tns-reset 3
+  gprs ns timer tns-reset-retries 3
+  gprs ns timer tns-test 30
+  gprs ns timer tns-alive 3
+  gprs ns timer tns-alive-retries 10
+  gprs nsvc 0 nsvci 951
+  gprs nsvc 0 local udp port 23000
+  gprs nsvc 0 remote udp port 23001
+  gprs nsvc 0 remote ip 127.0.0.1
+  <% else -%>gprs mode none
+  <% end -%>no force-combined-si
   trx 0
    rf_locked 0
    arfcn <%= @arfcn_A %>
@@ -126,10 +154,18 @@ network
      phys_chan_config TCH/F
      hopping enabled 0
     timeslot 6
+<% if @gprs == 'active' -%>
+     phys_chan_config TCH/F_PDCH
+<% else -%>
      phys_chan_config TCH/F
+<% end -%>
      hopping enabled 0
     timeslot 7
+<% if @gprs == 'active' -%>
+     phys_chan_config PDCH
+<% else -%>
      phys_chan_config TCH/F
+<% end -%>
      hopping enabled 0
 <% if @arfcn_B -%>
  bts 1