keith/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add GPRS config option, remove Riak management

Browse source
This commit is contained in:
Wile E. Coyote 2018-02-10 20:42:40 +00:00
parent a08a2a5ca3
commit 65715ea60f
4 changed files with 45 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/rhizo_base/manifests/init.pp
View file

@ -39,6 +39,7 @@ class rhizo_base {
$network_name = hiera('rhizo::network_name') $network_name = hiera('rhizo::network_name')
$auth_policy = hiera('rhizo::auth_policy') $auth_policy = hiera('rhizo::auth_policy')
$lac = hiera('rhizo::lac') $lac = hiera('rhizo::lac')
$gprs = hiera('rhizo::gprs')
#BTSs configuration #BTSs configuration
$bts_type = hiera('rhizo::bts_type') $bts_type = hiera('rhizo::bts_type')
@ -174,10 +175,10 @@ class rhizo_base {
group => 'root', group => 'root',
mode => '0755', mode => '0755',
source => 'puppet:///modules/rhizo_base/etc/init.d/riak', source => 'puppet:///modules/rhizo_base/etc/init.d/riak',
require => Class['::riak'], #require => Class['::riak'],
notify => Exec['insserv'], #notify => Exec['insserv'],
} }
include rhizo_base::riak #include rhizo_base::riak
} }
} else { } else {
file { '/etc/init.d/riak': file { '/etc/init.d/riak':

1
modules/rhizo_base/manifests/openbsc.pp
View file

@ -24,6 +24,7 @@ class rhizo_base::openbsc {
$bts2_ip_address = $rhizo_base::bts2_ip_address $bts2_ip_address = $rhizo_base::bts2_ip_address
$bts3_ip_address = $rhizo_base::bts3_ip_address $bts3_ip_address = $rhizo_base::bts3_ip_address
$smsc_password = $rhizo_base::smsc_password $smsc_password = $rhizo_base::smsc_password
$gprs = $rhizo_base::gprs
package { [ 'libosmoabis5', 'libosmocore8', package { [ 'libosmoabis5', 'libosmocore8',
'libosmoctrl0', 'libosmogsm7', 'libosmoctrl0', 'libosmogsm7',

2
modules/rhizo_base/manifests/riak.pp
View file

@ -23,7 +23,7 @@ class rhizo_base::riak {
class { '::riak': class { '::riak':
package_name => 'riak', # default package_name => 'riak', # default
service_name => 'riak', # default service_name => 'riak', # default
manage_package => true, # default manage_package => false, # default
manage_repo => false, manage_repo => false,
version => 'latest', # default, use a package version if desired version => 'latest', # default, use a package version if desired
# settings in the settings hash are written directly to settings.conf. # settings in the settings hash are written directly to settings.conf.

40
modules/rhizo_base/templates/osmo-nitb.cfg.erb
View file

@ -99,8 +99,36 @@ network
oml ip.access stream_id 255 line 0 oml ip.access stream_id 255 line 0
neighbor-list mode automatic neighbor-list mode automatic
codec-support fr codec-support fr
gprs mode none <% if @gprs == 'active' -%>gprs mode gprs
no force-combined-si 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 trx 0
rf_locked 0 rf_locked 0
arfcn <%= @arfcn_A %> arfcn <%= @arfcn_A %>
@ -126,10 +154,18 @@ network
phys_chan_config TCH/F phys_chan_config TCH/F
hopping enabled 0 hopping enabled 0
timeslot 6 timeslot 6
<% if @gprs == 'active' -%>
phys_chan_config TCH/F_PDCH
<% else -%>
phys_chan_config TCH/F phys_chan_config TCH/F
<% end -%>
hopping enabled 0 hopping enabled 0
timeslot 7 timeslot 7
<% if @gprs == 'active' -%>
phys_chan_config PDCH
<% else -%>
phys_chan_config TCH/F phys_chan_config TCH/F
<% end -%>
hopping enabled 0 hopping enabled 0
<% if @arfcn_B -%> <% if @arfcn_B -%>
bts 1 bts 1