diff --git a/modules/rhizo_base/files/systemd/osmo-msc.override b/modules/rhizo_base/files/systemd/osmo-msc.override deleted file mode 100644 index 234bf8a..0000000 --- a/modules/rhizo_base/files/systemd/osmo-msc.override +++ /dev/null @@ -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 diff --git a/modules/rhizo_base/manifests/osmocom.pp b/modules/rhizo_base/manifests/osmocom.pp index c4e8523..f80edcd 100644 --- a/modules/rhizo_base/manifests/osmocom.pp +++ b/modules/rhizo_base/manifests/osmocom.pp @@ -34,6 +34,7 @@ class rhizo_base::osmocom { '^(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+)$', '\\3-\\4'))) $mgw_num_ep = hiera('rhizo::mgw_num_ep', $bts.size * 24) + $osmo_local_bin = hiera('rhizo::osmo_local_bin', []) package { "osmocom-nitb": ensure => 'absent' @@ -165,8 +166,8 @@ class rhizo_base::osmocom { } systemd::dropin_file { 'override.conf': - unit => 'osmo-msc.service', - source => 'puppet:///modules/rhizo_base/systemd/osmo-msc.override' + unit => 'osmo-msc.service', + content => template('rhizo_base/osmo-msc.override.erb') } systemd::dropin_file { 'hlr-override': diff --git a/modules/rhizo_base/templates/osmo-msc.override.erb b/modules/rhizo_base/templates/osmo-msc.override.erb new file mode 100644 index 0000000..1224cd0 --- /dev/null +++ b/modules/rhizo_base/templates/osmo-msc.override.erb @@ -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