From 30198928481f46646b2847752011d806f7809235 Mon Sep 17 00:00:00 2001
From: Keith Whyte <keith@rhizomatica.org>
Date: Fri, 11 Sep 2020 12:58:46 +0200
Subject: [PATCH] Add hiera params for FS version and pinning

---
 modules/rhizo_base/manifests/apt.pp                       | 3 ++-
 modules/rhizo_base/manifests/freeswitch.pp                | 8 +++-----
 .../buster-pinning.pref.erb}                              | 2 +-
 .../stretch-pinning.pref.erb}                             | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename modules/rhizo_base/{files/buster-pinning.pref => templates/buster-pinning.pref.erb} (91%)
 rename modules/rhizo_base/{files/stretch-pinning.pref => templates/stretch-pinning.pref.erb} (91%)

diff --git a/modules/rhizo_base/manifests/apt.pp b/modules/rhizo_base/manifests/apt.pp
index 9ab7ac6..787e61a 100644
--- a/modules/rhizo_base/manifests/apt.pp
+++ b/modules/rhizo_base/manifests/apt.pp
@@ -18,6 +18,7 @@ class rhizo_base::apt {
 class rhizo_base::apt::common {
 
   $osmo_repo = hiera('rhizo::osmo_repo', 'latest')
+  $fs_pin    = hiera('rhizo::fs_pin', '1.10.3*')
 
   class { '::apt':
      update => {
@@ -32,7 +33,7 @@ class rhizo_base::apt::common {
 
   file { '/etc/apt/preferences.d/pinning.pref':
       ensure  => present,
-      source  => "puppet:///modules/rhizo_base/$lsbdistcodename-pinning.pref",
+      content => template("rhizo_base/$lsbdistcodename-pinning.pref.erb"),
     }
 
   apt::source { 'rhizomatica':
diff --git a/modules/rhizo_base/manifests/freeswitch.pp b/modules/rhizo_base/manifests/freeswitch.pp
index 854f07d..742a6e1 100644
--- a/modules/rhizo_base/manifests/freeswitch.pp
+++ b/modules/rhizo_base/manifests/freeswitch.pp
@@ -118,6 +118,7 @@ class rhizo_base::freeswitch::common {
   $reg_provider   = $rhizo_base::reg_provider
   $mncc_ip_address = $rhizo_base::mncc_ip_address
 
+  $fs_ensure     = hiera('rhizo::fs_ensure', 'present')
   package {
     ['freeswitch-lang-en',
     'freeswitch-mod-amr', 'freeswitch-mod-amrwb',
@@ -147,11 +148,8 @@ class rhizo_base::freeswitch::common {
     }
 
   package {
-    ['freeswitch' ]:
-      ensure  => $lsbdistcodename ? {
-        "stretch" => '1.10.3~release~15~129de34d84~stretch-1~stretch+1',
-        "buster"  => '1.10.3~release~15~129de34d84~buster-1~buster+1',
-        },
+    ['freeswitch', 'freeswitch-lang-en']:
+      ensure  => $fs_version,
       require => Class['rhizo_base::apt'],
     }
 
diff --git a/modules/rhizo_base/files/buster-pinning.pref b/modules/rhizo_base/templates/buster-pinning.pref.erb
similarity index 91%
rename from modules/rhizo_base/files/buster-pinning.pref
rename to modules/rhizo_base/templates/buster-pinning.pref.erb
index 1581913..730e145 100644
--- a/modules/rhizo_base/files/buster-pinning.pref
+++ b/modules/rhizo_base/templates/buster-pinning.pref.erb
@@ -1,5 +1,5 @@
 Package: freeswitch* libfreeswitch*
-Pin: version 1.10.3* 
+Pin: version <%= @fs_pin %>
 Pin-Priority: 510
 
 Package: postgresql-*-9.6 
diff --git a/modules/rhizo_base/files/stretch-pinning.pref b/modules/rhizo_base/templates/stretch-pinning.pref.erb
similarity index 91%
rename from modules/rhizo_base/files/stretch-pinning.pref
rename to modules/rhizo_base/templates/stretch-pinning.pref.erb
index 0437dc5..28891cd 100644
--- a/modules/rhizo_base/files/stretch-pinning.pref
+++ b/modules/rhizo_base/templates/stretch-pinning.pref.erb
@@ -1,5 +1,5 @@
 Package: freeswitch* libfreeswitch*
-Pin: version 1.10.3*
+Pin: version <%= @fs_pin %>
 Pin-Priority: 510
 
 Package: postgresql-*-9.6