From c3047b394074900205bee56a7ff9071b390480c9 Mon Sep 17 00:00:00 2001
From: Keith Whyte <keith@rhizomatica.org>
Date: Thu, 10 Jun 2021 07:26:41 +0200
Subject: [PATCH] Set some variables based on split stack

Also, Use the current WIP branch of meas vis for split stack
---
 modules/rhizo_base/manifests/init.pp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp
index 048e736..ea7a21c 100644
--- a/modules/rhizo_base/manifests/init.pp
+++ b/modules/rhizo_base/manifests/init.pp
@@ -40,11 +40,14 @@ class rhizo_base {
 
   # Network Stack
   $osmo_stack      = hiera('rhizo::osmo_stack', 'nitb')
-  $hlr_db          = hiera('rhizo::hlr_db', '/var/lib/osmocom/hlr.db')
+  $hlr_db = $osmo_stack ? {
+             'split' => '/var/lib/osmocom/hlr.db',
+             default => hiera('rhizo::hlr_db', '/var/lib/osmocom/hlr.db'),
+            }
   $sms_db = $osmo_stack ? {
              'split' => hiera('rhizo::sms_db', '/var/lib/osmocom/sms.db'),
              default => hiera('rhizo::sms_db', '/var/lib/osmocom/hlr.sqlite3'),
-             }
+            }
 
   # network name
   $network_name    = hiera('rhizo::network_name')
@@ -66,7 +69,10 @@ class rhizo_base {
   $inter_codec     = hiera('rhizo::inter_codec', 'G729')
   $dids            = hiera('rhizo::dids', '')
 
-  $lcls = hiera('rhizo::lcls', '0')
+  $lcls = $osmo_stack ? {
+           'split' => '0',
+           default =>  hiera('rhizo::lcls', '0')
+          }
   $jb_in = hiera('rhizo::jb_in', '')
   $jb_out = hiera('rhizo::jb_out', '')
   $jb_bts = hiera('rhizo::jb_bts', '100')
@@ -383,13 +389,18 @@ schedule { 'never':
                     Exec['rrd-n-create'], ],
     }
 
+  $meas_branch = $osmo_stack ? {
+    'split' => 'keith/osmo-bsc',
+    default => 'master'
+  }
+
   vcsrepo { '/var/meas':
       schedule => 'onceday',
       ensure   => latest,
       provider => git,
       # source   => 'https://github.com/whyteks/meas_web.git',
       source   => 'https://gitlab.tic-ac.org/keith/meas_web.git',
-      revision => 'master',
+      revision => $meas_branch,
       require  => [ Package['git'] ],
       notify   => [ Exec['restart-meas'] ],
     }