Skip to content

Commit

Permalink
Merge pull request #371 from Icinga/enhancement/remove-deprecated-par…
Browse files Browse the repository at this point in the history
…am-manage_repo

Remove deprecated parameter manage_repo
  • Loading branch information
lbetz committed Oct 18, 2023
2 parents eb094fd + 6a53eb6 commit 0b3acd4
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 18 deletions.
9 changes: 0 additions & 9 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ The following parameters are available in the `icingaweb2` class:
* [`module_path`](#-icingaweb2--module_path)
* [`theme`](#-icingaweb2--theme)
* [`theme_disabled`](#-icingaweb2--theme_disabled)
* [`manage_repo`](#-icingaweb2--manage_repo)
* [`manage_repos`](#-icingaweb2--manage_repos)
* [`manage_package`](#-icingaweb2--manage_package)
* [`extra_packages`](#-icingaweb2--extra_packages)
Expand Down Expand Up @@ -297,14 +296,6 @@ Whether users can change themes or not.

Default value: `false`

##### <a name="-icingaweb2--manage_repo"></a>`manage_repo`

Data type: `Boolean`

Deprecated, use manage_repos.

Default value: `false`

##### <a name="-icingaweb2--manage_repos"></a>`manage_repos`

Data type: `Boolean`
Expand Down
9 changes: 1 addition & 8 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
# @param theme_disabled
# Whether users can change themes or not.
#
# @param manage_repo
# Deprecated, use manage_repos.
#
# @param manage_repos
# When set to true this module will use the module icinga/puppet-icinga to manage repositories,
# e.g. the release repo on packages.icinga.com repository by default, the EPEL repository or Backports.
Expand Down Expand Up @@ -228,7 +225,6 @@
Boolean $show_stacktraces = false,
String $theme = 'Icinga',
Boolean $theme_disabled = false,
Boolean $manage_repo = false,
Boolean $manage_repos = false,
Boolean $manage_package = true,
Optional[Array[String]] $extra_packages = undef,
Expand Down Expand Up @@ -258,11 +254,8 @@
) {
require icingaweb2::globals

if $manage_repos or $manage_repo {
if $manage_repos {
require icinga::repos
if $manage_repo {
deprecation('manage_repo', 'manage_repo is deprecated and will be replaced by manage_repos in the future.')
}
}

class { 'icingaweb2::install': }
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/class_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class { '::apache':
-> Class['apache']
class { 'icingaweb2':
manage_repo => true,
manage_repos => true,
conf_user => $web_conf_user,
db_type => 'mysql',
db_host => 'localhost',
Expand Down

0 comments on commit 0b3acd4

Please sign in to comment.