diff options
| author | Keith Burdis <keith@burdis.org> | 2013-02-08 16:47:44 +0000 |
|---|---|---|
| committer | Keith Burdis <keith@burdis.org> | 2013-02-08 16:47:44 +0000 |
| commit | 07b0b601cfb9ad4224e3b65fccb736bc5c93f41d (patch) | |
| tree | 1a219b451f391a5ae8e1c20bfff50bbea5c3ee74 | |
| parent | 0e98162550bddfa83b2300d046d8f42aceee56eb (diff) | |
Specify the correct package name otherwise the check to see if it is already installed fails.
| -rw-r--r-- | manifests/install.pp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/manifests/install.pp b/manifests/install.pp index 7aba697..97f7efa 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -15,9 +15,11 @@ class check_mk::install ( source => "${filestore}/${package}", require => File[$workspace], } - if $package =~ /^omd-(.*?)\.(rpm|deb)$/ { - $type = $2 - package { $package: + # omd-0.56-rh60-29.x86_64.rpm + if $package =~ /^(omd-\d+\.\d+)-(.*?)\.(rpm|deb)$/ { + $package_name = $1 + $type = $3 + package { $package_name: ensure => installed, provider => $type, source => "${workspace}/${package}", @@ -26,7 +28,8 @@ class check_mk::install ( } } else { - package { $package: + $package_name = $package + package { $package_name: ensure => installed, } } @@ -34,6 +37,6 @@ class check_mk::install ( exec { 'omd-create-site': command => "/usr/bin/omd create ${site}", creates => $etc_dir, - require => Package[$package], + require => Package[$package_name], } } |