From 53ba6815a304c877c29b09a408c4e06b51eabe96 Mon Sep 17 00:00:00 2001 From: Keith Whyte Date: Fri, 23 Feb 2018 11:25:10 +0000 Subject: [PATCH] Test #1 for error free 1st run --- modules/ntp | 2 +- modules/rhizo_base/manifests/apt.pp | 46 +++++++++++----------- modules/rhizo_base/manifests/freeswitch.pp | 5 ++- modules/rhizo_base/manifests/init.pp | 11 +++--- modules/rhizo_base/manifests/openbsc.pp | 9 +---- modules/rhizo_base/manifests/packages.pp | 6 --- 6 files changed, 36 insertions(+), 43 deletions(-) diff --git a/modules/ntp b/modules/ntp index 1f519f7..93da3bd 160000 --- a/modules/ntp +++ b/modules/ntp @@ -1 +1 @@ -Subproject commit 1f519f719552aedc98b6995e42d23201a0286a58 +Subproject commit 93da3bd01a5ae4276eddec15ac615eb4bccc23cf diff --git a/modules/rhizo_base/manifests/apt.pp b/modules/rhizo_base/manifests/apt.pp index a8ab21a..439463d 100644 --- a/modules/rhizo_base/manifests/apt.pp +++ b/modules/rhizo_base/manifests/apt.pp @@ -19,7 +19,7 @@ class rhizo_base::apt::common { class { '::apt': update => { - frequency => 'daily', + frequency => 'weekly', }, } @@ -72,12 +72,13 @@ class rhizo_base::apt::ubuntu inherits rhizo_base::apt::common { class rhizo_base::apt::debian inherits rhizo_base::apt::common { apt::source { 'freeswitch': - location => 'http://files.freeswitch.org/repo/deb/freeswitch-1.6/', - release => 'jessie', - repos => 'main', - key => { - 'id' => '25E010CF', - 'source' => 'http://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub' + location => 'http://files.freeswitch.org/repo/deb/freeswitch-1.6/', + release => 'jessie', + repos => 'main', + notify => Exec['apt_update'], + key => { + 'id' => '20B06EE621AB150D40F6079FD76EDC7725E010CF', + 'source' => 'http://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub' } } @@ -86,9 +87,9 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common { release => 'jessie', repos => 'main', key => { - 'id' => '68576280', + 'id' => '9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280', 'source' => 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key' - } + } } apt::source { 'irontec': @@ -96,25 +97,26 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common { release => 'jessie', repos => 'main', key => { - 'id' => 'D8C20040', + 'id' => '4FF7139B43073A436D8C2C4F90D20F5ED8C20040', 'source' => 'http://packages.irontec.com/public.key' - } + } } apt::source { 'rhizo-jessie': - location => 'http://repo.rhizomatica.org/debian/', - release => 'jessie', - repos => 'main', - require => File['/etc/apt/apt.conf.d/90unsigned'], + location => 'http://repo.rhizomatica.org/debian/', + release => 'jessie', + repos => 'main', + require => File['/etc/apt/apt.conf.d/90unsigned'], } apt::source { 'osmocom-nightly': - location => 'http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/', - release => './', - repos => '', - key => { - 'id' => '17280DDF', - 'source' => 'http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/Release.key' - } + location => 'http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/', + release => './', + repos => '', + notify => Exec['apt_update'], + key => { + 'id' => '0080689BE757A876CB7DC26962EB1A0917280DDF', + 'source' => 'http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/Release.key' + } } } diff --git a/modules/rhizo_base/manifests/freeswitch.pp b/modules/rhizo_base/manifests/freeswitch.pp index 01a8740..7fd4510 100644 --- a/modules/rhizo_base/manifests/freeswitch.pp +++ b/modules/rhizo_base/manifests/freeswitch.pp @@ -45,8 +45,8 @@ class rhizo_base::freeswitch::debian inherits rhizo_base::freeswitch::common { require => Class['rhizo_base::apt'], } - file { '/usr/lib/freeswitch/mod/mod_cdr_pg_csv.so': - source => 'puppet:///modules/rhizo_base/usr/lib/freeswitch/mod/mod_cdr_pg_csv.so', + file { '/usr/lib/freeswitch/mod/mod_g729.so': + source => 'puppet:///modules/rhizo_base/mod_g729.so', require => Package['freeswitch'], } @@ -59,6 +59,7 @@ class rhizo_base::freeswitch::debian inherits rhizo_base::freeswitch::common { ensure => directory, owner => 'freeswitch', group => 'freeswitch', + require => Package['freeswitch'] } systemd::unit_file { 'freeswitch.service': diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp index 6c4c687..0c3fbd9 100644 --- a/modules/rhizo_base/manifests/init.pp +++ b/modules/rhizo_base/manifests/init.pp @@ -146,19 +146,19 @@ class rhizo_base { include sshkeys include rhizo_base::fixes include rhizo_base::apt - include rhizo_base::postgresql + include rhizo_base::users include rhizo_base::packages + include rhizo_base::postgresql include rhizo_base::freeswitch include rhizo_base::runit include rhizo_base::openbsc include rhizo_base::lcr include rhizo_base::sudo - include rhizo_base::users + include rhizo_base::kiwi if $operatingsystem != 'Debian' { include rhizo_base::icinga } - include rhizo_base::kiwi if $vpn_ip_address == $riak_ip_address { if $operatingsystem != 'Debian' { @@ -183,7 +183,6 @@ class rhizo_base { value => '1' } - #Rhizomatica scripts file { '/home/rhizomatica/bin': ensure => directory, @@ -224,7 +223,9 @@ class rhizo_base { ensure => directory, owner => 'postgres', group => 'postgres', - require => File['/var/rhizo_backups'], + require => [ File['/var/rhizo_backups'], + Class['rhizo_base::postgresql'] + ] } file { '/var/rhizo_backups/sqlite': diff --git a/modules/rhizo_base/manifests/openbsc.pp b/modules/rhizo_base/manifests/openbsc.pp index bee6e46..3370119 100644 --- a/modules/rhizo_base/manifests/openbsc.pp +++ b/modules/rhizo_base/manifests/openbsc.pp @@ -25,12 +25,6 @@ class rhizo_base::openbsc { $bts3_ip_address = $rhizo_base::bts3_ip_address $smsc_password = $rhizo_base::smsc_password - package { [ 'libsmpp0', ]: - ensure => latest, - require => Class['rhizo_base::apt'], - notify => [ Exec['notify-nitb'] ], - } - package { [ 'osmocom-nitb' ]: ensure => 'latest', require => Class['rhizo_base::apt'], @@ -38,7 +32,7 @@ class rhizo_base::openbsc { Exec['notify-nitb'] ], } - package { [ 'libosmoabis3', + package { [ 'libsmpp34-0', 'libosmoabis3', 'libosmoctrl0', 'libosmogsm6', 'libosmogsm7', 'libosmovty3', @@ -50,6 +44,7 @@ class rhizo_base::openbsc { 'libosmo-sccp-dbg', 'libosmo-sccp-dev', 'libosmocodec0', 'libosmocore', 'libosmocore-dbg', 'libosmocore-dev', + 'libosmocore6', 'libosmogsm5', 'libosmocore-utils', 'libosmogb3', 'libosmonetif2', 'libosmosim0', 'libosmotrau0']: diff --git a/modules/rhizo_base/manifests/packages.pp b/modules/rhizo_base/manifests/packages.pp index f4ddafb..16980f2 100644 --- a/modules/rhizo_base/manifests/packages.pp +++ b/modules/rhizo_base/manifests/packages.pp @@ -14,13 +14,8 @@ class rhizo_base::packages { include "rhizo_base::packages::$operatingsystem" } - class rhizo_base::packages::common { - package { [ 'python-python-smpplib' ]: - ensure => purged - } - package { ['mosh', 'git', 'openvpn', 'lm-sensors', 'runit-systemd', 'sqlite3', 'libffi-dev', 'apcupsd', 'expect', 'gawk', 'swig', 'g++', 'libcdk5' , 'sngrep', 'rrdtool', 'dnsmasq', 'joe', @@ -29,7 +24,6 @@ class rhizo_base::packages::common { ensure => installed, require => Class['rhizo_base::apt'], } - } class rhizo_base::packages::ubuntu inherits rhizo_base::packages::common {