From 4bb2d2e99d8c60619e3611fbcf38c35c8ddca3fa Mon Sep 17 00:00:00 2001 From: Keith Whyte Date: Sat, 27 Feb 2021 05:59:36 +0100 Subject: [PATCH] The last commit only for nightly --- modules/rhizo_base/manifests/openbsc.pp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/rhizo_base/manifests/openbsc.pp b/modules/rhizo_base/manifests/openbsc.pp index 04d91d6..b2ce65d 100644 --- a/modules/rhizo_base/manifests/openbsc.pp +++ b/modules/rhizo_base/manifests/openbsc.pp @@ -138,11 +138,6 @@ class rhizo_base::openbsc { mode => "0750", } - file { '/etc/osmocom/osmo-sgsn.cfg': - content => template('rhizo_base/osmo-sgsn-ns1.cfg.erb'), - mode => "0750", - notify => Service['osmo-sgsn'], - } systemd::dropin_file { 'override.conf': unit => 'osmo-sgsn.service', @@ -155,6 +150,18 @@ class rhizo_base::openbsc { default => 'installed', } + $sgsn_cfg_file = $repo ? { + 'latest' => '-ns1', + 'nightly' => '', + default => '', + } + + file { '/etc/osmocom/osmo-sgsn.cfg': + content => template("rhizo_base/osmo-sgsn$sgsn_cfg_file.cfg.erb"), + mode => "0750", + notify => Service['osmo-sgsn'], + } + package { [ 'osmo-sgsn' ]: ensure => $sgsn_version, require => Class['rhizo_base::apt'],