diff options
Diffstat (limited to 'modules/puppet')
-rw-r--r-- | modules/puppet/manifests/hiera.pp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/modules/puppet/manifests/hiera.pp b/modules/puppet/manifests/hiera.pp index 8b692316..338b67e1 100644 --- a/modules/puppet/manifests/hiera.pp +++ b/modules/puppet/manifests/hiera.pp @@ -1,11 +1,17 @@ class puppet::hiera { - package { ['ruby-hiera','ruby-hiera-puppet']: } + package { ['ruby-hiera']: } - # ugly, remove once hiera is either fixed or integrated to puppet - file { '/etc/puppet/external/hiera': - ensure => link, - target => '/usr/lib/ruby/gems/1.8/gems/hiera-puppet-0.3.0/', - require => Package['ruby-hiera-puppet'], + if versioncmp($::lsbdistrelease, '4') < 0 { + package { ['ruby-hiera-puppet']: } + # ugly hack for puppet 2.7, since hiera has been integrated + # from puppet 3 only (Mageia 4) + file { '/etc/puppet/external/hiera': + ensure => link, + # this should be /usr/share/ruby/gems/gems/hiera-puppet-1.0.0 + # on Mageia 3, but we do not have any infra hosts running mga3 + target => '/usr/lib/ruby/gems/1.8/gems/hiera-puppet-0.3.0/', + require => Package['ruby-hiera-puppet'], + } } # ease the use fo the command line tool |