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

WS and comments

Browse source
This commit is contained in:
Keith Whyte 2020-05-22 04:20:28 +02:00
parent 8b2e6e6eb3
commit 85b3ab856c
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/rhizo_base/files/var/SysmoBTS/provision.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# This script will copy files to the 2050 BTS(s) on the site # This script will copy files to the 2050 BTS(s) on the site
# running the script more than once should be safe. # running the script more than once is expected to be safe.
if [ "$PWD" != "/var/SysmoBTS" ]; then if [ "$PWD" != "/var/SysmoBTS" ]; then
OLDPWD=$PWD OLDPWD=$PWD

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

@ -79,17 +79,17 @@ class rhizo_base {
# IP address # IP address
$mncc_ip_address = hiera('rhizo::mncc_ip_address', '172.16.0.1') $mncc_ip_address = hiera('rhizo::mncc_ip_address', '172.16.0.1')
$vpn_ip_address = hiera('rhizo::vpn_ip_address')
$wan_ip_address = hiera('rhizo::wan_ip_address')
$bsc_ip_address = hiera('rhizo::bsc_ip_address', '172.16.0.1') $bsc_ip_address = hiera('rhizo::bsc_ip_address', '172.16.0.1')
$vpn_ip_address = hiera('rhizo::vpn_ip_address')
$wan_ip_address = hiera('rhizo::wan_ip_address')
$riak_ip_address = hiera('rhizo::riak_ip_address', $vpn_ip_address) $riak_ip_address = hiera('rhizo::riak_ip_address', $vpn_ip_address)
$sip_central_ip_address = hiera('rhizo::sip_central_ip_address') $sip_central_ip_address = hiera('rhizo::sip_central_ip_address')
$webphone_prefix = hiera('rhizo::webphone_prefix', '[]') $webphone_prefix = hiera('rhizo::webphone_prefix', '[]')
$latency_check_address = hiera('rhizo::latency_check_address','1.1.1.1') $latency_check_address = hiera('rhizo::latency_check_address','1.1.1.1')
$latency_check_vpn = hiera('rhizo::latency_check_vpn','10.23.0.2') $latency_check_vpn = hiera('rhizo::latency_check_vpn','10.23.0.2')
$stats_disk = hiera('rhizo::stats_disk','sda1') $stats_disk = hiera('rhizo::stats_disk','sda1')
$stats_if = hiera('rhizo::stats_if','eth0') $stats_if = hiera('rhizo::stats_if','eth0')
# SITE settings # SITE settings
# rate type can be "call" or "min" # rate type can be "call" or "min"
@ -500,6 +500,9 @@ schedule { 'repo':
} }
} }
# Files and scripts that will be used to (re)provision a connected BTS
# of the osmocom variety.
file { '/var/SysmoBTS': file { '/var/SysmoBTS':
ensure => directory, ensure => directory,
source => 'puppet:///modules/rhizo_base/var/SysmoBTS', source => 'puppet:///modules/rhizo_base/var/SysmoBTS',

2
modules/rhizo_base/templates/bts_defs.js.erb
View file

@ -1,5 +1,5 @@
const bts_defs = [ const bts_defs = [
// Index, Name, ARFCN, BSIC // Index, TRX, Name, ARFCN, BSIC
<% @bts.each_with_index do |bts, index| -%> <% @bts.each_with_index do |bts, index| -%>
<% bts["trx"].each_with_index do |trx, trx_i| -%> <% bts["trx"].each_with_index do |trx, trx_i| -%>
[<%= index %>, <%= trx_i %>, "<%= bts["name"] %>", <%= trx["chan"]%>, <%= bts["bsic"]%>], [<%= index %>, <%= trx_i %>, "<%= bts["name"] %>", <%= trx["chan"]%>, <%= bts["bsic"]%>],