From 2774694b4cf028323b3a4a450c8da6d148b6b595 Mon Sep 17 00:00:00 2001 From: Monocots Date: Tue, 25 Oct 2022 18:59:44 +0000 Subject: [PATCH] Update package versions and ensure rules --- modules/rhizo_base/manifests/kiwi.pp | 2 +- modules/rhizo_base/manifests/osmocom.pp | 119 ++++++++++++----------- modules/rhizo_base/manifests/packages.pp | 28 ++++-- 3 files changed, 81 insertions(+), 68 deletions(-) diff --git a/modules/rhizo_base/manifests/kiwi.pp b/modules/rhizo_base/manifests/kiwi.pp index a03db2c..224f744 100644 --- a/modules/rhizo_base/manifests/kiwi.pp +++ b/modules/rhizo_base/manifests/kiwi.pp @@ -33,7 +33,7 @@ class rhizo_base::kiwi { ['nodejs']: ensure => $lsbdistcodename ? { "stretch" => '0.10.48-1nodesource1~jessie1', - "buster" => '10.24.0~dfsg-1~deb10u1', + "buster" => '10.24.0~dfsg-1~deb10u2', }, require => Class['rhizo_base::apt'], } diff --git a/modules/rhizo_base/manifests/osmocom.pp b/modules/rhizo_base/manifests/osmocom.pp index 3381cef..61d4e94 100644 --- a/modules/rhizo_base/manifests/osmocom.pp +++ b/modules/rhizo_base/manifests/osmocom.pp @@ -8,6 +8,58 @@ # class rhizo_base::osmocom { + contain "rhizo_base::osmocom::$lsbdistcodename" +} + +class rhizo_base::osmocom::buster inherits rhizo_base::osmocom::common { + + package { [ "osmocom-latest" ]: + ensure => 'installed' + } + package { [ 'osmo-bsc', 'osmo-bsc-meas-utils' ]: + ensure => '1.9.0rhizo2b', + require => Class['rhizo_base::apt'], + } + package { [ 'osmo-msc' ]: + require => Class['rhizo_base::apt'], + ensure => '1.9.0+rhizo7b', + } + package { [ 'osmo-sgsn' ]: + ensure => '1.9.0', + require => Class['rhizo_base::apt'], + } + package { [ 'osmo-sip-connector' ]: + ensure => '1.6.1rhizo1b', + require => Class['rhizo_base::apt'], + } + +} + +class rhizo_base::osmocom::stretch inherits rhizo_base::osmocom::common { + + package { [ 'osmo-bsc' ]: + ensure => '1.9.0rhizo1', + require => Class['rhizo_base::apt'], + } + package { [ 'osmo-msc' ]: + ensure => '1.9.0+rhizo7s', + require => Class['rhizo_base::apt'], + } + package { [ 'osmo-sgsn' ]: + ensure => '1.9.0rhizo1', + require => Class['rhizo_base::apt'], + } + package { [ 'osmo-sip-connector' ]: + ensure => '1.6.1rhizo1', + require => Class['rhizo_base::apt'], + } + package { [ 'osmo-bsc-meas-utils' ]: + ensure => 'installed', + } + +} + +class rhizo_base::osmocom::common { include systemd $network_name = $rhizo_base::network_name @@ -40,70 +92,19 @@ class rhizo_base::osmocom { ensure => 'absent' } - package { 'systemd-coredump': - ensure => 'installed', + package { [ 'python3-osmopy-libs', 'python3-osmopy-utils', + 'systemd-coredump', 'libosmocore-utils' ]: + ensure => 'installed', } - package { [ 'osmo-stp', 'osmo-mgw', 'osmo-sgsn', - 'python3-osmopy-libs', 'python3-osmopy-utils' ]: - ensure => 'installed', + package { [ 'libsmpp1', 'libosmo-sigtran7', 'libosmocore', + 'libosmo-mgcp-client9', 'libosmoabis10', 'libosmo-mslookup0', + 'libosmonetif8', 'libosmotrau2', 'libosmo-gsup-client0', + 'osmo-stp', 'libgtp6', 'osmo-hlr', 'osmo-mgw' ]: + ensure => 'latest', require => Class['rhizo_base::apt'] } - $bsc_version = $repo ? { - 'latest' => 'installed', - 'nightly' => 'latest', - default => '1.7.0', - } - - package { [ "osmocom-$repo" ]: - ensure => 'installed' - } - - package { [ 'osmo-bsc' ]: - ensure => $bsc_version, - require => Class['rhizo_base::apt'], - } - - package { [ 'osmo-msc' ]: - ensure => 'installed', - require => Class['rhizo_base::apt'], - } - - package { [ 'libsmpp1', 'libosmo-sigtran7' ]: - ensure => 'installed', - } - - package { [ 'osmo-hlr' ]: - ensure => 'installed', - require => Class['rhizo_base::apt'], - } - - $sipcon_version = $repo ? { - 'latest' => 'installed', - 'nightly' => 'latest', - default => '1.5.1', - } - - package { [ 'osmo-sip-connector' ]: - ensure => $sipcon_version, - require => Class['rhizo_base::apt'], - } - - $utils_version = $repo ? { - 'latest' => '1.8.1', - 'nightly' => 'latest', - default => '1.7.0', - } - - package { [ 'osmo-bsc-meas-utils' ]: - ensure => $utils_version, - } - - package { [ 'libosmocore-utils' ]: - ensure => 'installed', - } - $ts0_phys_chan = "CCCH" $ts1_phys_chan = "SDCCH8" diff --git a/modules/rhizo_base/manifests/packages.pp b/modules/rhizo_base/manifests/packages.pp index 0711ace..75e2449 100644 --- a/modules/rhizo_base/manifests/packages.pp +++ b/modules/rhizo_base/manifests/packages.pp @@ -18,19 +18,26 @@ class rhizo_base::packages::common { include stdlib - package { ['apache2','libapache2-mod-php', 'php', 'php-pgsql', - 'php-curl', 'php-cli', 'php-gd', 'php-intl', 'php-gettext', - 'sudo']: - ensure => installed, + package { ['sngrep', 'tcpdump', 'sudo', 'curl', 'screen', 'tzdata', 'file', 'git', + 'bzip2', 'unzip', 'gdb', 'cron', 'gzip', 'iproute2', 'psmisc', 'dpkg', 'apt', + 'vim-common', 'vim-tiny', 'xxd', ]: + ensure => latest, require => Class['rhizo_base::apt'], } - package { ['mosh', 'tmux', 'git', 'openvpn', 'lm-sensors', 'runit-systemd', 'sqlite3', - 'libffi-dev', 'apcupsd', 'expect', 'gawk', 'swig', 'g++', 'tinc', 'tcpdump', - 'sngrep', 'rrdtool', 'dnsmasq', 'joe', 'curl', 'htop', 'screen', 'iperf3', 'iftop', + package { [ 'libc-ares2', 'libc-bin', 'bind9-host', 'rsyslog', 'facter' ]: + ensure => latest, + require => Class['rhizo_base::apt'], + } + + package { ['mosh', 'tmux', 'openvpn', 'lm-sensors', 'runit-systemd', 'sqlite3', + 'libffi-dev', 'apcupsd', 'expect', 'gawk', 'swig', 'g++', 'tinc', + 'rrdtool', 'dnsmasq', 'joe', 'htop', 'iperf3', 'iftop', 'websocketd', 'fping', 'mtr-tiny', 'openssh-server', 'telnet', 'netcat-traditional', 'python-unidecode', 'python-dateutil', 'python-yaml', 'python-formencode', - 'python-smpplib', 'python-psycopg2', 'python-pysqlite2', 'rsync', 'pkg-config', 'libicu-dev' ]: + 'python-smpplib', 'python-psycopg2', 'python-pysqlite2', 'rsync', 'pkg-config', 'libicu-dev', + 'apache2','libapache2-mod-php', 'php', 'php-pgsql', 'php-curl', 'php-cli', 'php-gd', + 'php-intl', 'php-gettext' ]: ensure => installed, require => Class['rhizo_base::apt'], } @@ -54,6 +61,11 @@ class rhizo_base::packages::buster inherits rhizo_base::packages::common { require => Class['rhizo_base::apt'], } + package { [ 'libssl1.1', 'libsofia-sip-ua0', 'libsqlite3-0', ]: + ensure => latest, + require => Class['rhizo_base::apt'], + } + # FIXME: An Apache restart is required after this change. file_line { 'apache_php': ensure => present,