From c564e170977c056c48264f5670e623de25d19e1a Mon Sep 17 00:00:00 2001
From: Keith Whyte <keith@rhizomatica.org>
Date: Mon, 5 Oct 2020 17:57:05 +0200
Subject: [PATCH] Always install and run osmo-sgsn

The old (soon to be removed) openbsc class installed
the osmo-sgsn dependent on a config parameter. Leave the config
param as a possibility to be set to 'disabled', but otherwise
install and run the sgsn.

Prevent errors output from cron jobs trying access the sgsn vty
---
 modules/rhizo_base/manifests/openbsc.pp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/rhizo_base/manifests/openbsc.pp b/modules/rhizo_base/manifests/openbsc.pp
index 716d0d5..2908f49 100644
--- a/modules/rhizo_base/manifests/openbsc.pp
+++ b/modules/rhizo_base/manifests/openbsc.pp
@@ -96,6 +96,12 @@ class rhizo_base::openbsc {
       require => Package['osmo-sip-connector'],
     }
 
+  service { 'osmo-sgsn':
+      enable  => true,
+      ensure  => running,
+      require => Package['osmo-sgsn'],
+    }
+
   file { '/usr/local/bin/vty':
       source  => 'puppet:///modules/rhizo_base/vty',
       owner   => 'root',
@@ -123,7 +129,7 @@ class rhizo_base::openbsc {
       require => Package['osmo-sip-connector'],
     }
 
-  if ($gprs == "active") {
+  if ($gprs != "disabled") {
     file { '/etc/osmocom/make_sgsn_acl_config':
          content => template('rhizo_base/make_sgsn_acl_config.erb'),
          mode => "0750",