From d6eda914f98db8f9aae628c99c3befd90221830e Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 15 Jul 2021 19:20:26 +0200 Subject: [PATCH 1/2] Vagrant: icinga_packages: include icinga-php-* from release repo ... as they're not snapshotted. --- .puppet/modules/icinga_packages/manifests/init.pp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.puppet/modules/icinga_packages/manifests/init.pp b/.puppet/modules/icinga_packages/manifests/init.pp index cee3ccced..a73a74956 100644 --- a/.puppet/modules/icinga_packages/manifests/init.pp +++ b/.puppet/modules/icinga_packages/manifests/init.pp @@ -14,4 +14,13 @@ class icinga_packages { gpgkey => 'https://packages.icinga.com/icinga.key', descr => "Icinga Repository - ${::architecture}" } + + yumrepo { 'icinga_release_packages': + baseurl => "https://packages.icinga.com/epel/${::operatingsystemmajrelease}/release/", + enabled => '1', + gpgcheck => '1', + gpgkey => 'https://packages.icinga.com/icinga.key', + descr => "Icinga Repository - ${::architecture} (release)", + includepkgs => 'icinga-php-*' + } } From 035ab7ed4a5e30cab60c2412acdf9ed1e6f7fd93 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 15 Jul 2021 19:21:49 +0200 Subject: [PATCH 2/2] Vagrant: icingaweb2_dev: install icinga-php-{library,thirdparty} --- .puppet/profiles/icingaweb2_dev/manifests/init.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.puppet/profiles/icingaweb2_dev/manifests/init.pp b/.puppet/profiles/icingaweb2_dev/manifests/init.pp index 2a86a4af7..684b84e8c 100644 --- a/.puppet/profiles/icingaweb2_dev/manifests/init.pp +++ b/.puppet/profiles/icingaweb2_dev/manifests/init.pp @@ -22,6 +22,8 @@ class icingaweb2_dev ( # TODO(el): icinga-gui is not a icingaweb2_dev package package { [ + 'icinga-php-library', + 'icinga-php-thirdparty', 'rh-php73-php-cli', 'rh-php73-php-gd', 'rh-php73-php-intl', @@ -47,7 +49,7 @@ class icingaweb2_dev ( -> exec { 'enable-monitoring-module': command => 'icingacli module enable monitoring', user => 'apache', - require => Class[[ 'icingacli', 'apache' ]], + require => [ Class[[ 'icingacli', 'apache' ]], Package[[ 'icinga-php-library', 'icinga-php-thirdparty' ]] ], } -> exec { 'enable-test-module': command => 'icingacli module enable test',