keith/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add hiera params for FS version and pinning

Browse source
This commit is contained in:
Keith Whyte 2020-09-11 12:58:46 +02:00
parent 5fafee41db
commit 3019892848
4 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/rhizo_base/manifests/apt.pp
View file

@ -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':

8
modules/rhizo_base/manifests/freeswitch.pp
View file

@ -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'],
}