From 4c89d41b78659b4556df7d8dd3318dec4843778c Mon Sep 17 00:00:00 2001 From: Lennart Betz Date: Fri, 1 Sep 2023 14:47:44 +0200 Subject: [PATCH] drop parameter manage_package --- README.md | 2 +- manifests/feature/idomysql.pp | 5 ++--- manifests/feature/idopgsql.pp | 5 ++--- manifests/init.pp | 8 -------- manifests/install.pp | 3 +-- 5 files changed, 6 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 7ea71874..bec87238 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ And depends on: * [icinga/icinga] >= 1.0.0 < 3.0.0 * needed if `manage_repos` is set to `true` * [puppetlabs/chocolatey] - * needed if agent os is windows and if either `manage_package` or `manage_packages` is set to `true` + * needed if agent os is windows and if `manage_packages` is set to `true` ### Limitations The use of Icinga's own CA is recommended. If you still want to use the Puppet certificates, please note that Puppet 7 uses an intermediate CA by default and Icinga cannot handle its CA certificate, see [Icinga Issue](https://github.com/Icinga/icinga2/pull/8859). diff --git a/manifests/feature/idomysql.pp b/manifests/feature/idomysql.pp index d693e37c..52c87c4f 100644 --- a/manifests/feature/idomysql.pp +++ b/manifests/feature/idomysql.pp @@ -129,7 +129,6 @@ $ssl_dir = $icinga2::globals::cert_dir $ido_mysql_package_name = $icinga2::globals::ido_mysql_package_name $ido_mysql_schema = $icinga2::globals::ido_mysql_schema - $manage_package = $icinga2::manage_package $manage_packages = $icinga2::manage_packages $type = if $import_schema =~ Boolean { @@ -201,7 +200,7 @@ } # install additional package - if $ido_mysql_package_name and ($manage_package or $manage_packages) { + if $ido_mysql_package_name and $manage_packages { if $facts['os']['family'] == 'debian' { ensure_resources('file', { '/etc/dbconfig-common' => { ensure => directory, owner => 'root', group => 'root' } }) file { "/etc/dbconfig-common/${ido_mysql_package_name}.conf": @@ -222,7 +221,7 @@ # import db schema if $import_schema { - if $ido_mysql_package_name and ($manage_package or $manage_packages) { + if $ido_mysql_package_name and $manage_packages { Package[$ido_mysql_package_name] -> Exec['idomysql-import-schema'] } diff --git a/manifests/feature/idopgsql.pp b/manifests/feature/idopgsql.pp index 9edb5962..35403852 100644 --- a/manifests/feature/idopgsql.pp +++ b/manifests/feature/idopgsql.pp @@ -115,7 +115,6 @@ $ssl_dir = $icinga2::globals::cert_dir $ido_pgsql_package_name = $icinga2::globals::ido_pgsql_package_name $ido_pgsql_schema = $icinga2::globals::ido_pgsql_schema - $manage_package = $icinga2::manage_package $manage_packages = $icinga2::manage_packages $enable_ssl = if $ssl_mode and $ssl_mode != 'disabled' { @@ -182,7 +181,7 @@ } # install additional package - if $ido_pgsql_package_name and ($manage_package or $manage_packages) { + if $ido_pgsql_package_name and $manage_packages { if $facts['os']['family'] == 'debian' { ensure_resources('file', { '/etc/dbconfig-common' => { ensure => directory, owner => 'root', group => 'root' } }) file { "/etc/dbconfig-common/${ido_pgsql_package_name}.conf": @@ -203,7 +202,7 @@ # import db schema if $import_schema { - if $ido_pgsql_package_name and ($manage_package or $manage_packages) { + if $ido_pgsql_package_name and $manage_packages { Package[$ido_pgsql_package_name] -> Exec['idopgsql-import-schema'] } diff --git a/manifests/init.pp b/manifests/init.pp index 0392feff..c66150b8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -85,9 +85,6 @@ # e.g. the release repo on packages.icinga.com repository by default, the EPEL repository or Backports. # For more information, see http://github.com/icinga/puppet-icinga. # -# @param manage_package -# Deprecated, use manage_packages. -# # @param manage_packages # If set to false packages aren't managed. # @@ -124,7 +121,6 @@ Boolean $enable = true, Boolean $manage_repo = false, Boolean $manage_repos = false, - Boolean $manage_package = false, Boolean $manage_packages = true, Boolean $manage_selinux = false, Boolean $manage_service = true, @@ -151,10 +147,6 @@ -> Concat <| tag == 'icinga2::config::file' |> ~> Class['icinga2::service'] - if $manage_package { - deprecation('manage_package', 'manage_package is deprecated and will be replaced by manage_packages in the future.') - } - if $manage_repos or $manage_repo { require icinga::repos if $manage_repo { diff --git a/manifests/install.pp b/manifests/install.pp index daf9f6f2..4924e8a3 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -8,7 +8,6 @@ assert_private() $package_name = $icinga2::globals::package_name - $manage_package = $icinga2::manage_package $manage_packages = $icinga2::manage_packages $selinux_package_name = $icinga2::globals::selinux_package_name $manage_selinux = $icinga2::manage_selinux @@ -17,7 +16,7 @@ $user = $icinga2::globals::user $group = $icinga2::globals::group - if $manage_package or $manage_packages { + if $manage_packages { if $facts['os']['family'] == 'windows' { Package { provider => chocolatey, } } package { $package_name: