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

reminder to switch version to rccn production for going live and mergefix

Browse source
This commit is contained in:
dave onion 2015-10-29 12:06:30 -06:00
commit 5f2ba3993d
10 changed files with 72 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/python

@ -1 +1 @@
Subproject commit 09967704c152f5fd044ed4ddbc7382ef2e24aea5
Subproject commit eb52429dbf78778a4871169571a744bff44a6287

2
modules/rhizo_base/files/etc/cron.d/rhizomatica
View file

@ -22,7 +22,7 @@ PYTHONPATH=$PYTHONPATH:/var/rhizomatica/rccn
# */10 * * * * root /home/rhizomatica/bin/bind_check.sh
#Roaming jobs
*/30 * * * * root /usr/bin/python /var/rhizomatica/rccn/rrc.py > /dev/null 2>&1 ; /usr/bin/python /var/rhizomatica/rccn/rhs.py > /dev/null 2>&1
*/30 * * * * root timeout 10m /usr/bin/python /var/rhizomatica/rccn/rrc.py > /dev/null 2>&1 ; timeout 15m /usr/bin/python /var/rhizomatica/rccn/rhs.py > /dev/null 2>&1
#Cleanup inactive users
0 5 * * * root /usr/bin/python /var/rhizomatica/rccn/rip.py > /dev/null 2>&1

8
modules/rhizo_base/files/etc/freeswitch/sip_profiles/internal.xml
View file

@ -91,9 +91,9 @@
<param name="outbound-codec-prefs" value="$${global_codec_prefs}"/>
<param name="rtp-timer-name" value="soft"/>
<!-- ip address to use for rtp, DO NOT USE HOSTNAMES ONLY IP ADDRESSES -->
<param name="rtp-ip" value="127.0.0.1"/>
<param name="rtp-ip" value="172.16.0.1"/>
<!-- ip address to bind to, DO NOT USE HOSTNAMES ONLY IP ADDRESSES -->
<param name="sip-ip" value="127.0.0.1"/>
<param name="sip-ip" value="172.16.0.1"/>
<!--<param name="hold-music" value="$${hold_music}"/>-->
<param name="apply-nat-acl" value="nat.auto"/>
@ -272,8 +272,8 @@
auto - Use guessed ip.
auto-nat - Use ip learned from NAT-PMP or UPNP
-->
<param name="ext-rtp-ip" value="auto-nat"/>
<param name="ext-sip-ip" value="auto-nat"/>
<param name="ext-rtp-ip" value="172.16.0.1"/>
<param name="ext-sip-ip" value="172.16.0.1"/>
<!-- rtp inactivity timeout -->
<param name="rtp-timeout-sec" value="300"/>

2
modules/rhizo_base/files/etc/sv/lcr/run
View file

@ -1,2 +1,2 @@
#!/bin/sh
/usr/sbin/lcr start
exec /usr/sbin/lcr start

10
modules/rhizo_base/files/usr/etc/lcr/interface.conf
View file

@ -3,15 +3,15 @@ gsm-bs
tones yes
earlyb no
# These two lines enable RTP bridging
#bridge Ext
#rtp-bridge
bridge Ext
rtp-bridge
[Ext]
#sip <local ip>[:<local port>] <remote ip>[:<remote port>]
sip 127.0.0.1:5050 127.0.0.1:5060
sip 172.16.0.1:5050 172.16.0.1:5060
earlyb yes
tones yes
extern
# These two lines enable RTP bridging
#bridge gsm
#rtp-bridge
bridge gsm
rtp-bridge

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

@ -34,6 +34,7 @@ class rhizo_base {
# network name
$network_name = hiera('rhizo::network_name')
$auth_policy = hiera('rhizo::auth_policy')
$lac = hiera('rhizo::lac')
#BTSs configuration
$bts1_ip_address = hiera('rhizo::bts1_ip_address')
@ -189,6 +190,8 @@ class rhizo_base {
provider => git,
source => 'https://github.com/Rhizomatica/rccn.git',
revision => 'multilectical/localnetpage',
# change back for production
# revision => '1.0.6',
require => [ File['/var/rhizomatica'], Package['git'] ],
notify => [ Exec['locale-gen'],
Exec['restart-freeswitch'],

8
modules/rhizo_base/manifests/lcr.pp
View file

@ -12,8 +12,14 @@
#
class rhizo_base::lcr {
package { 'lcr':
ensure => installed,
ensure => latest,
require => Class['rhizo_base::apt'],
notify => Exec['restart-lcr'],
}
exec { 'restart-lcr':
command => '/usr/bin/sv restart lcr',
refreshonly => true,
}
service { 'lcr':

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

@ -13,6 +13,7 @@
class rhizo_base::openbsc {
$network_name = $rhizo_base::network_name
$auth_policy = $rhizo_base::auth_policy
$lac = $rhizo_base::lac
$max_power_red = $rhizo_base::max_power_red
$arfcn_A = $rhizo_base::arfcn_A
$arfcn_B = $rhizo_base::arfcn_B
@ -24,21 +25,41 @@ class rhizo_base::openbsc {
$bts3_ip_address = $rhizo_base::bts3_ip_address
$smsc_password = $rhizo_base::smsc_password
package { ['osmocom-nitb', 'osmocom-nitb-dbg',
'libdbd-sqlite3', 'libsmpp0']:
ensure => installed,
require => Class['rhizo_base::apt'],
notify => Exec['hlr_pragma_wal'],
package { [ 'libosmoabis4', 'libosmocore6',
'libosmoctrl0', 'libosmogsm5',
'libosmovty1', 'osmocom-nitb',
'osmocom-nitb-dbg']:
ensure => latest,
require => Class['rhizo_base::apt'],
notify => [ Exec['hlr_pragma_wal'],
Exec['restart-nitb'] ],
}
package { [ 'libosmoabis3', 'libosmocore4',
'libosmogsm6', 'libosmovty0',
'libgtp', 'libgtp0',
'libgtp0-dev', 'openggsn',
'libosmo-abis', 'libosmo-abis-dbg',
'libosmo-abis-dev', 'libosmo-netif-dbg',
'libosmo-netif-dev', 'libosmo-sccp',
'libosmo-sccp-dbg', 'libosmo-sccp-dev',
'libosmocodec0', 'libosmocore',
'libosmocore-dbg', 'libosmocore-dev',
'libosmocore-utils', 'libosmogb3',
'libosmonetif2', 'libosmosim0',
'libosmotrau0']:
ensure => purged,
}
service { 'osmocom-nitb':
enable => false,
require => Package['osmocom-nitb']
require => Package['osmocom-nitb'],
}
file { '/etc/osmocom/osmo-nitb.cfg':
content => template('rhizo_base/osmo-nitb.cfg.erb'),
require => Package['osmocom-nitb'],
notify => Exec['restart-nitb'],
}
exec { 'hlr_pragma_wal':
@ -47,4 +68,11 @@ class rhizo_base::openbsc {
require => Class['rhizo_base::packages'],
refreshonly => true,
}
exec { 'restart-nitb':
command => '/usr/bin/sv restart osmo-nitb',
require => Class['rhizo_base::packages'],
refreshonly => true,
}
}

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

@ -6,6 +6,7 @@ password foo
log stderr
logging filter all 1
logging color 1
logging print category 0
logging timestamp 0
logging level all notice
logging level rll notice
@ -31,6 +32,7 @@ log stderr
logging level nat notice
logging level ctrl notice
logging level smpp notice
logging level filter notice
logging level lglobal notice
logging level llapd notice
logging level linp notice
@ -38,6 +40,8 @@ log stderr
logging level lmi notice
logging level lmib notice
logging level lsms notice
logging level lctrl notice
logging level lgtp notice
!
line vty
no login
@ -83,7 +87,7 @@ network
type sysmobts
band GSM850
cell_identity 0
location_area_code 1
location_area_code <%= @lac %>
base_station_id_code 63
ms max power 33
cell reselection hysteresis 14
@ -136,7 +140,7 @@ network
type sysmobts
band GSM850
cell_identity 1
location_area_code 1
location_area_code <%= @lac %>
base_station_id_code 63
ms max power 33
cell reselection hysteresis 14
@ -190,7 +194,7 @@ network
type sysmobts
band GSM850
cell_identity 2
location_area_code 1
location_area_code <%= @lac %>
base_station_id_code 63
ms max power 33
cell reselection hysteresis 14
@ -243,7 +247,7 @@ network
type sysmobts
band GSM850
cell_identity 3
location_area_code 1
location_area_code <%= @lac %>
base_station_id_code 63
ms max power 33
cell reselection hysteresis 14
@ -298,7 +302,7 @@ network
type sysmobts
band GSM850
cell_identity 4
location_area_code 1
location_area_code <%= @lac %>
base_station_id_code 63
ms max power 33
cell reselection hysteresis 14
@ -351,7 +355,7 @@ network
type sysmobts
band GSM850
cell_identity 5
location_area_code 1
location_area_code <%= @lac %>
base_station_id_code 63
ms max power 33
cell reselection hysteresis 14
@ -404,9 +408,13 @@ network
mncc-int
default-codec tch-f fr
default-codec tch-h hr
nitb
subscriber-create-on-demand
no assign-tmsi
smpp
local-tcp-port 2775
policy closed
smpp-first
esme OSMPP
password <%= @smsc_password %>
default-route