From 85b3ab856c7b247156253216f2c4adff417accf9 Mon Sep 17 00:00:00 2001 From: Keith Whyte Date: Fri, 22 May 2020 04:20:28 +0200 Subject: [PATCH] WS and comments --- .../rhizo_base/files/var/SysmoBTS/provision.sh | 2 +- modules/rhizo_base/manifests/init.pp | 15 +++++++++------ modules/rhizo_base/templates/bts_defs.js.erb | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/rhizo_base/files/var/SysmoBTS/provision.sh b/modules/rhizo_base/files/var/SysmoBTS/provision.sh index 296a9fe..b392478 100644 --- a/modules/rhizo_base/files/var/SysmoBTS/provision.sh +++ b/modules/rhizo_base/files/var/SysmoBTS/provision.sh @@ -1,7 +1,7 @@ #!/bin/bash # 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 OLDPWD=$PWD diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp index 103f068..ceea27b 100644 --- a/modules/rhizo_base/manifests/init.pp +++ b/modules/rhizo_base/manifests/init.pp @@ -79,17 +79,17 @@ class rhizo_base { # IP address $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') + $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) $sip_central_ip_address = hiera('rhizo::sip_central_ip_address') - $webphone_prefix = hiera('rhizo::webphone_prefix', '[]') - $latency_check_address = hiera('rhizo::latency_check_address','1.1.1.1') - $latency_check_vpn = hiera('rhizo::latency_check_vpn','10.23.0.2') + $webphone_prefix = hiera('rhizo::webphone_prefix', '[]') + $latency_check_address = hiera('rhizo::latency_check_address','1.1.1.1') + $latency_check_vpn = hiera('rhizo::latency_check_vpn','10.23.0.2') $stats_disk = hiera('rhizo::stats_disk','sda1') - $stats_if = hiera('rhizo::stats_if','eth0') + $stats_if = hiera('rhizo::stats_if','eth0') # SITE settings # 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': ensure => directory, source => 'puppet:///modules/rhizo_base/var/SysmoBTS', diff --git a/modules/rhizo_base/templates/bts_defs.js.erb b/modules/rhizo_base/templates/bts_defs.js.erb index 002cf27..3e22bd5 100644 --- a/modules/rhizo_base/templates/bts_defs.js.erb +++ b/modules/rhizo_base/templates/bts_defs.js.erb @@ -1,5 +1,5 @@ const bts_defs = [ -// Index, Name, ARFCN, BSIC +// Index, TRX, Name, ARFCN, BSIC <% @bts.each_with_index do |bts, index| -%> <% bts["trx"].each_with_index do |trx, trx_i| -%> [<%= index %>, <%= trx_i %>, "<%= bts["name"] %>", <%= trx["chan"]%>, <%= bts["bsic"]%>],