opuppet/module-icingaweb2
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Puppet 4.0.0 compatibility fixes

Browse source
This commit is contained in:
Tom De Vylder 2015-04-23 11:26:23 +02:00
parent b2817fc85f
commit 0ded568a44
5 changed files with 6 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
manifests/config.pp
View file

@ -1,12 +1,9 @@
# == Class icingaweb2::config # == Class icingaweb2::config
# #
class icingaweb2::config { class icingaweb2::config (
if is_function_available('assert_private') { $config_dir = $::icingaweb2::config_dir,
assert_private() $web_root = $::icingaweb2::web_root,
} else { ) {
private()
}
@user { 'icingaweb2': @user { 'icingaweb2':
ensure => present, ensure => present,
home => $::icingaweb2::web_root, home => $::icingaweb2::web_root,

2
manifests/init.pp
View file

@ -220,7 +220,7 @@ class icingaweb2 (
class { 'icingaweb2::preinstall': } -> class { 'icingaweb2::preinstall': } ->
class { 'icingaweb2::install': } -> class { 'icingaweb2::install': } ->
class { 'icingaweb2::config': } -> class { 'icingaweb2::config': } ->
Class [ 'icingaweb2' ] Class['icingaweb2']
validate_absolute_path($config_dir) validate_absolute_path($config_dir)
validate_absolute_path($web_root) validate_absolute_path($web_root)

8
manifests/install.pp
View file

@ -1,12 +1,6 @@
# == Class icingaweb2::install # == Class icingaweb2::install
# #
class icingaweb2::install { class icingaweb2::install {
if is_function_available('assert_private') {
assert_private()
} else {
private()
}
if $::icingaweb2::install_method == 'package' { if $::icingaweb2::install_method == 'package' {
if $::icingaweb2::pkg_list { if $::icingaweb2::pkg_list {
package { $::icingaweb2::pkg_list: package { $::icingaweb2::pkg_list:
@ -29,7 +23,7 @@ class icingaweb2::install {
before => Vcsrepo['icingaweb2'], before => Vcsrepo['icingaweb2'],
} }
} }
vcsrepo { 'icingaweb2': vcsrepo { 'icingaweb2':
ensure => present, ensure => present,
path => $::icingaweb2::web_root, path => $::icingaweb2::web_root,

6
manifests/preinstall.pp
View file

@ -1,12 +1,6 @@
# == Class icingaweb2::preinstall # == Class icingaweb2::preinstall
# #
class icingaweb2::preinstall { class icingaweb2::preinstall {
if is_function_available('assert_private') {
assert_private()
} else {
private()
}
if $::icingaweb2::manage_repo and $::icingaweb2::install_method == 'package' { if $::icingaweb2::manage_repo and $::icingaweb2::install_method == 'package' {
case $::operatingsystem { case $::operatingsystem {
'RedHat', 'CentOS': { 'RedHat', 'CentOS': {

6
manifests/preinstall/redhat.pp
View file

@ -3,12 +3,6 @@
define icingaweb2::preinstall::redhat( define icingaweb2::preinstall::redhat(
$pkg_repo_version, $pkg_repo_version,
) { ) {
if is_function_available('assert_private') {
assert_private()
} else {
private()
}
case $::operatingsystem { case $::operatingsystem {
'RedHat', 'CentOS', 'Scientific': { 'RedHat', 'CentOS', 'Scientific': {
case $pkg_repo_version { case $pkg_repo_version {