From dd2878b0764f2765ac197fd35b6637add45f498a Mon Sep 17 00:00:00 2001
From: Monocots <gitmaster@rhizomatica.org>
Date: Sat, 10 Aug 2019 07:58:31 +0000
Subject: [PATCH] Swap LCR for osmo-sip-connector

Install osmo-sip-connector from package repo
Install the sip connector config file.
Disable LCR in runit
Also adds hiera param lcls for new functionality with sip-connector
---
 modules/rhizo_base/manifests/init.pp              |  1 +
 modules/rhizo_base/manifests/openbsc.pp           | 15 ++++++++++++++-
 modules/rhizo_base/manifests/runit.pp             |  8 +++++++-
 modules/rhizo_base/templates/config_values.py.erb |  1 +
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp
index 7507413..1168eb5 100644
--- a/modules/rhizo_base/manifests/init.pp
+++ b/modules/rhizo_base/manifests/init.pp
@@ -67,6 +67,7 @@ class rhizo_base {
   $inter_codec     = hiera('rhizo::inter_codec', 'G729')
 
   # IP address
+  $lcls = hiera('rhizo::lcls', '0')
   $mncc_ip_address = hiera('rhizo::mncc_ip_address', '172.16.0.1')
   $vpn_ip_address = hiera('rhizo::vpn_ip_address')
   $wan_ip_address = hiera('rhizo::wan_ip_address')
diff --git a/modules/rhizo_base/manifests/openbsc.pp b/modules/rhizo_base/manifests/openbsc.pp
index 7db09b7..374fd0e 100644
--- a/modules/rhizo_base/manifests/openbsc.pp
+++ b/modules/rhizo_base/manifests/openbsc.pp
@@ -31,6 +31,7 @@ class rhizo_base::openbsc {
   $smpp_password   = $rhizo_base::smpp_password
   $mncc_codec      = $rhizo_base::mncc_codec
   $gprs            = $rhizo_base::gprs
+  $mncc_ip_address = $rhizo_base::mncc_ip_address
   $vpn_ip_address  = hiera('rhizo::vpn_ip_address')
   $ggsn_ip_address = hiera('rhizo::ggsn_ip_address')
 
@@ -41,7 +42,7 @@ class rhizo_base::openbsc {
                     Exec['notify-nitb'] ],
     }
 
-  package { [ 'osmo-bsc-meas-utils' ]:
+  package { [ 'osmo-bsc-meas-utils', 'osmo-sip-connector' ]:
       ensure   => 'installed'
     }
 
@@ -56,6 +57,13 @@ class rhizo_base::openbsc {
       require => Package['osmocom-nitb'],
     }
 
+  service { 'osmo-sip-connector':
+      enable  => false,
+      ensure  => stopped,
+      require => Package['osmo-sip-connector'],
+    }
+
+
   file { '/etc/default/osmocom-nitb':
       source  => 'puppet:///modules/rhizo_base/etc/default/osmocom-nitb',
       require => Package['osmocom-nitb'],
@@ -69,6 +77,11 @@ class rhizo_base::openbsc {
       }
   }
 
+  file { '/etc/osmocom/osmo-sip-connector.cfg':
+      content => template('rhizo_base/osmo-sip-connector.cfg.erb'),
+      require => Package['osmo-sip-connector'],
+    }
+
   if ($gprs == "active") {
     file { '/etc/osmocom/make_sgsn_acl_config':
          content => template('rhizo_base/make_sgsn_acl_config.erb'),
diff --git a/modules/rhizo_base/manifests/runit.pp b/modules/rhizo_base/manifests/runit.pp
index 8c227a6..28050a8 100644
--- a/modules/rhizo_base/manifests/runit.pp
+++ b/modules/rhizo_base/manifests/runit.pp
@@ -54,11 +54,17 @@ class rhizo_base::runit {
     }
 
   file { '/etc/service/lcr':
-      ensure  => link,
+      ensure  => false,
       target  => '/etc/sv/lcr',
       require => [ File['/etc/sv'], Class['rhizo_base::lcr'] ],
     }
 
+  file { '/etc/service/osmo-sip-connector':
+      ensure  => link,
+      target  => '/etc/sv/osmo-sip-connector',
+      require => [ File['/etc/sv'] ],
+    }
+
   file { '/etc/service/kiwi':
       ensure  => link,
       target  => '/etc/sv/kiwi',
diff --git a/modules/rhizo_base/templates/config_values.py.erb b/modules/rhizo_base/templates/config_values.py.erb
index 0834e1a..d691a03 100644
--- a/modules/rhizo_base/templates/config_values.py.erb
+++ b/modules/rhizo_base/templates/config_values.py.erb
@@ -4,6 +4,7 @@
 # Configuration settings
 reload_on_call = 0
 default_log_level = '<%= @default_log_level %>'
+lcls = '<%= @lcls %>'
 
 rhizomatica_dir = '<%= @rhizomatica_dir %>'
 sq_hlr_path = '<%= @sq_hlr_path %>'