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

Set some variables based on split stack

Browse source 
Also, Use the current WIP branch of meas vis for split stack
This commit is contained in:
Keith Whyte 2021-06-10 07:26:41 +02:00
parent aa09c262b4
commit c3047b3940
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,11 +40,14 @@ class rhizo_base {
# Network Stack # Network Stack
$osmo_stack = hiera('rhizo::osmo_stack', 'nitb') $osmo_stack = hiera('rhizo::osmo_stack', 'nitb')
$hlr_db = hiera('rhizo::hlr_db', '/var/lib/osmocom/hlr.db') $hlr_db = $osmo_stack ? {
'split' => '/var/lib/osmocom/hlr.db',
default => hiera('rhizo::hlr_db', '/var/lib/osmocom/hlr.db'),
}
$sms_db = $osmo_stack ? { $sms_db = $osmo_stack ? {
'split' => hiera('rhizo::sms_db', '/var/lib/osmocom/sms.db'), 'split' => hiera('rhizo::sms_db', '/var/lib/osmocom/sms.db'),
default => hiera('rhizo::sms_db', '/var/lib/osmocom/hlr.sqlite3'), default => hiera('rhizo::sms_db', '/var/lib/osmocom/hlr.sqlite3'),
} }
# network name # network name
$network_name = hiera('rhizo::network_name') $network_name = hiera('rhizo::network_name')
@ -66,7 +69,10 @@ class rhizo_base {
$inter_codec = hiera('rhizo::inter_codec', 'G729') $inter_codec = hiera('rhizo::inter_codec', 'G729')
$dids = hiera('rhizo::dids', '') $dids = hiera('rhizo::dids', '')
$lcls = hiera('rhizo::lcls', '0') $lcls = $osmo_stack ? {
'split' => '0',
default => hiera('rhizo::lcls', '0')
}
$jb_in = hiera('rhizo::jb_in', '') $jb_in = hiera('rhizo::jb_in', '')
$jb_out = hiera('rhizo::jb_out', '') $jb_out = hiera('rhizo::jb_out', '')
$jb_bts = hiera('rhizo::jb_bts', '100') $jb_bts = hiera('rhizo::jb_bts', '100')
@ -383,13 +389,18 @@ schedule { 'never':
Exec['rrd-n-create'], ], Exec['rrd-n-create'], ],
} }
$meas_branch = $osmo_stack ? {
'split' => 'keith/osmo-bsc',
default => 'master'
}
vcsrepo { '/var/meas': vcsrepo { '/var/meas':
schedule => 'onceday', schedule => 'onceday',
ensure => latest, ensure => latest,
provider => git, provider => git,
# source => 'https://github.com/whyteks/meas_web.git', # source => 'https://github.com/whyteks/meas_web.git',
source => 'https://gitlab.tic-ac.org/keith/meas_web.git', source => 'https://gitlab.tic-ac.org/keith/meas_web.git',
revision => 'master', revision => $meas_branch,
require => [ Package['git'] ], require => [ Package['git'] ],
notify => [ Exec['restart-meas'] ], notify => [ Exec['restart-meas'] ],
} }