diff --git a/manifests/cgroups.pp b/manifests/cgroups.pp index e379c60..d878d79 100644 --- a/manifests/cgroups.pp +++ b/manifests/cgroups.pp @@ -36,7 +36,7 @@ class jenkins::cgroups { # Starting with Ubuntu Quantal (12.10) cgroup-bin dropped its upstart jobs. if $::osfamily == 'Debian' { - if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= '12.10' { + if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '12.10') >= 0 { file { '/etc/init/cgconfig.conf': ensure => present, diff --git a/manifests/params.pp b/manifests/params.pp index 12a2a60..e5a411c 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -7,7 +7,7 @@ class jenkins::params { 'RedHat': { #yum groupinstall "Development Tools" # common packages - if ($::operatingsystem == 'Fedora') and ($::operatingsystemrelease >= 21) { + if ($::operatingsystem == 'Fedora') and (versioncmp($::operatingsystemrelease, '21') >= 0) { $jdk_package = 'java-1.8.0-openjdk-devel' } else { $jdk_package = 'java-1.7.0-openjdk-devel' @@ -17,7 +17,7 @@ class jenkins::params { # FIXME: No Maven packages on RHEL #$maven_package = 'maven' $cgroups_package = 'libcgroup' - if ($::operatingsystem == 'Fedora') and ($::operatingsystemrelease >= 19) { + if ($::operatingsystem == 'Fedora') and (versioncmp($::operatingsystemrelease, '19') >= 0) { $cgroups_tools_package = 'libcgroup-tools' $cgconfig_require = [ Package['cgroups'], diff --git a/manifests/plugin.pp b/manifests/plugin.pp index 03bb4c5..ac1be8c 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -18,19 +18,18 @@ # define jenkins::plugin( - $version=0, + $version='latest', $pin=false, ) { $plugin = "${name}.hpi" $plugin_dir = '/var/lib/jenkins/plugins' $plugin_parent_dir = '/var/lib/jenkins' - if ($version != 0) { + if ($version == 'latest') { + $base_url = 'http://updates.jenkins-ci.org/latest' + } else { $base_url = "http://updates.jenkins-ci.org/download/plugins/${name}/${version}" } - else { - $base_url = 'http://updates.jenkins-ci.org/latest' - } if (!defined(File[$plugin_dir])) { file {