From 8b2e6e6eb32eca649d564c5cdb6c3d5ca253b740 Mon Sep 17 00:00:00 2001 From: Keith Whyte Date: Fri, 22 May 2020 04:19:13 +0200 Subject: [PATCH] Create templates for BTS config --- .../files/var/SysmoBTS/provision.sh | 1 + modules/rhizo_base/manifests/init.pp | 17 ++++++++- .../templates/osmo-bts-sysmo.cfg.erb | 35 +++++++++++++++++++ .../osmo-pcu.cfg.erb} | 3 +- 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 modules/rhizo_base/templates/osmo-bts-sysmo.cfg.erb rename modules/rhizo_base/{files/var/SysmoBTS/osmo-pcu.cfg => templates/osmo-pcu.cfg.erb} (61%) diff --git a/modules/rhizo_base/files/var/SysmoBTS/provision.sh b/modules/rhizo_base/files/var/SysmoBTS/provision.sh index d1b0754..296a9fe 100644 --- a/modules/rhizo_base/files/var/SysmoBTS/provision.sh +++ b/modules/rhizo_base/files/var/SysmoBTS/provision.sh @@ -18,6 +18,7 @@ for bts in "${!BTS[@]}" ; do ssh $SSH_OPTS root@${BTS[$bts]} "date -s '$(date)'" ssh $SSH_OPTS root@${BTS[$bts]} "echo nameserver 1.1.1.1 > /etc/resolv.conf; echo nameserver 9.9.9.9 >> /etc/resolv.conf" scp $SSH_OPTS osmo-pcu.cfg root@${BTS[$bts]}:/etc/osmocom/osmo-pcu.cfg + scp $SSH_OPTS osmo-bts_$bts.cfg root@${BTS[$bts]}:/etc/osmocom/osmo-bts-sysmo.cfg scp $SSH_OPTS pcu bts root@${BTS[$bts]}:/bin/ ssh $SSH_OPTS root@${BTS[$bts]} "chmod 750 /bin/pcu /bin/bts" ssh $SSH_OPTS root@${BTS[$bts]} "expect -v 2>/dev/null" diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp index fa2c1b3..103f068 100644 --- a/modules/rhizo_base/manifests/init.pp +++ b/modules/rhizo_base/manifests/init.pp @@ -40,7 +40,7 @@ class rhizo_base { $network_name = hiera('rhizo::network_name') $auth_policy = hiera('rhizo::auth_policy') $lac = hiera('rhizo::lac') - $gprs = hiera('rhizo::gprs') + $gprs = hiera('rhizo::gprs', 'egprs') $gsm_band = hiera('rhizo::gsm_band', "GSM850") $mcc = hiera('rhizo::mcc', '334') $mnc = hiera('rhizo::mnc', '7') @@ -81,6 +81,7 @@ class rhizo_base { $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') $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', '[]') @@ -507,6 +508,20 @@ schedule { 'repo': recurse => remote } + $bts.each |Integer $i, Hash $b| { + file { "/var/SysmoBTS/osmo-bts_${i}.cfg": + ensure => present, + content => template('rhizo_base/osmo-bts-sysmo.cfg.erb'), + mode => '0640', + } + } + + file { '/var/SysmoBTS/osmo-pcu.cfg': + ensure => present, + content => template('rhizo_base/osmo-pcu.cfg.erb'), + mode => '0640', + } + file { '/var/SysmoBTS/check.sh': source => 'puppet:///modules/rhizo_base/var/SysmoBTS/check.sh', mode => '0750' diff --git a/modules/rhizo_base/templates/osmo-bts-sysmo.cfg.erb b/modules/rhizo_base/templates/osmo-bts-sysmo.cfg.erb new file mode 100644 index 0000000..671ed57 --- /dev/null +++ b/modules/rhizo_base/templates/osmo-bts-sysmo.cfg.erb @@ -0,0 +1,35 @@ +! +! OsmoBTS () configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging timestamp 0 + logging print file 1 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp info + logging level abis notice +! +line vty + no login +! +phy 0 + instance 0 +bts 0 + band <%= @bts[@i]["band"] %> + ipa unit-id 1000 <%= @bts[@i]["uid"] %> + oml remote-ip <%= @bsc_ip_address %> + rtp jitter-buffer <%= @jb_bts %> + trx 0 + phy 0 instance 0 + nominal-tx-power <%= @bts[@i]["nom"] %> diff --git a/modules/rhizo_base/files/var/SysmoBTS/osmo-pcu.cfg b/modules/rhizo_base/templates/osmo-pcu.cfg.erb similarity index 61% rename from modules/rhizo_base/files/var/SysmoBTS/osmo-pcu.cfg rename to modules/rhizo_base/templates/osmo-pcu.cfg.erb index 4ad0104..6306b2e 100644 --- a/modules/rhizo_base/files/var/SysmoBTS/osmo-pcu.cfg +++ b/modules/rhizo_base/templates/osmo-pcu.cfg.erb @@ -1,5 +1,6 @@ pcu - egprs only +<% if @gprs == 'egprs' -%> egprs only +<% end -%> flow-control-interval 10 cs 4 alloc-algorithm dynamic