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

Update the meas-web installation

Browse source 
Use new repo and add BTS definitions file
This commit is contained in:
Keith Whyte 2020-04-28 23:17:38 +02:00
parent 46eb3e89a6
commit be9d9573b8
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,7 @@ class rhizo_base {
$mnc = hiera('rhizo::mnc', '7') $mnc = hiera('rhizo::mnc', '7')
#BTSs configuration #BTSs configuration
$bts = hiera('rhizo::bts')
$bts_type = hiera('rhizo::bts_type') $bts_type = hiera('rhizo::bts_type')
$bts_amps = hiera('rhizo::bts_amps', "on") $bts_amps = hiera('rhizo::bts_amps', "on")
$bts1_ip_address = hiera('rhizo::bts1_ip_address') $bts1_ip_address = hiera('rhizo::bts1_ip_address')
@ -348,16 +349,22 @@ schedule { 'repo':
Exec['restart-esme'], ], Exec['restart-esme'], ],
} }
vcsrepo { '/var/meas_web': vcsrepo { '/var/meas':
schedule => 'always', schedule => 'always',
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',
revision => 'master', revision => 'master',
require => [ Package['git'] ], require => [ Package['git'] ],
notify => [ Exec['restart-meas'] ], notify => [ Exec['restart-meas'] ],
} }
file { '/var/meas/www/meas-web/bts_defs.js':
ensure => present,
content => template('rhizo_base/bts_defs.js.erb'),
}
file { '/var/rhizomatica/bin/get_account_balance.sh': file { '/var/rhizomatica/bin/get_account_balance.sh':
ensure => present, ensure => present,
content => template('rhizo_base/get_account_balance.sh.erb'), content => template('rhizo_base/get_account_balance.sh.erb'),
@ -483,8 +490,8 @@ schedule { 'repo':
file { '/var/www/meas': file { '/var/www/meas':
ensure => link, ensure => link,
target => '/var/meas_web/usr/share/fairwaves-meas-web/', target => '/var/meas/www/meas-web',
require => [ Vcsrepo['/var/meas_web'] ], require => [ Vcsrepo['/var/meas'] ],
} }
file { '/var/www/html/rai': file { '/var/www/html/rai':

8
modules/rhizo_base/templates/bts_defs.js.erb Normal file
View file

@ -0,0 +1,8 @@
const bts_defs = [
// Index, 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"]%>],
<% end -%>
<% end -%>
]