From b647a8025425cae10d9069ac05324123eabf9435 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Wed, 21 Oct 2015 11:52:51 +0300 Subject: [PATCH] puppet: Remove redundant ruby-augeas dependency --- puppet/manifests/init.pp | 2 -- ruby/manifests/init.pp | 36 ------------------------------------ 2 files changed, 38 deletions(-) diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp index cd35b9c..2261880 100644 --- a/puppet/manifests/init.pp +++ b/puppet/manifests/init.pp @@ -30,8 +30,6 @@ class puppet::client { default: { $vardir = "/var/lib/puppet" } } - require ruby::augeas - file { "/etc/puppet/puppet.conf": ensure => present, content => template("puppet/puppet.conf.erb"), diff --git a/ruby/manifests/init.pp b/ruby/manifests/init.pp index db3611c..fa52d6e 100644 --- a/ruby/manifests/init.pp +++ b/ruby/manifests/init.pp @@ -57,42 +57,6 @@ class ruby::activerecord { } -# Install ruby-augeas. -# -class ruby::augeas { - - case $::operatingsystem { - "openbsd": { - if versioncmp($::operatingsystemrelease, "5.6") >= 0 { - $package = "ruby20-augeas" - } elsif versioncmp($::operatingsystemrelease, "5.4") >= 0 { - $package = "ruby19-augeas" - } else { - $package = undef - } - } - "ubuntu": { - if versioncmp($::operatingsystemrelease, "13.10") >= 0 { - $package = "ruby-augeas" - } else { - $package = "libaugeas-ruby" - } - } - default: { - $package = "ruby-augeas" - } - } - - if $package { - package { "ruby-augeas": - ensure => installed, - name => $package, - } - } - -} - - # Install mysql ruby bindings. # class ruby::mysql {