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

Add possibility use osmo binaries from /usr/local

Browse source
This commit is contained in:
Keith Whyte 2022-07-03 23:20:52 +02:00
parent 9c1f72a257
commit dffa533c68
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/rhizo_base/files/systemd/osmo-msc.override
View file

@ -1,4 +0,0 @@
[Service]
ExecStart=
ExecStart=/usr/bin/osmo-msc -c /etc/osmocom/osmo-msc.cfg -l /var/lib/osmocom/sms.db
ExecStartPost=/home/rhizomatica/bin/swap_lac.sh

5
modules/rhizo_base/manifests/osmocom.pp
View file

@ -34,6 +34,7 @@ class rhizo_base::osmocom {
'^(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+)$', '^(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+)$',
'\\3-\\4'))) '\\3-\\4')))
$mgw_num_ep = hiera('rhizo::mgw_num_ep', $bts.size * 24) $mgw_num_ep = hiera('rhizo::mgw_num_ep', $bts.size * 24)
$osmo_local_bin = hiera('rhizo::osmo_local_bin', [])
package { "osmocom-nitb": package { "osmocom-nitb":
ensure => 'absent' ensure => 'absent'
@ -165,8 +166,8 @@ class rhizo_base::osmocom {
} }
systemd::dropin_file { 'override.conf': systemd::dropin_file { 'override.conf':
unit => 'osmo-msc.service', unit => 'osmo-msc.service',
source => 'puppet:///modules/rhizo_base/systemd/osmo-msc.override' content => template('rhizo_base/osmo-msc.override.erb')
} }
systemd::dropin_file { 'hlr-override': systemd::dropin_file { 'hlr-override':

4
modules/rhizo_base/templates/osmo-msc.override.erb Normal file
View file

@ -0,0 +1,4 @@
[Service]
ExecStart=
ExecStart=/usr/<% if @osmo_local_bin.include? 'osmo-msc' -%>local/<% end -%>bin/osmo-msc -c /etc/osmocom/osmo-msc.cfg
ExecStartPost=/home/rhizomatica/bin/swap_lac.sh