diff options
| -rw-r--r-- | manifests/base.pp | 10 | ||||
| -rw-r--r-- | spec/classes/couchdb_spec.rb | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 7413c42..48596cd 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -32,11 +32,13 @@ class couchdb::base { # and it needs the ruby-dev package installed to build #include ruby::devel - case $::operatingsystemmajrelease { - '7': { $couchrest_version = '1.2'} - default:{ $couchrest_version = 'latest'} + if versioncmp($::operatingsystemrelease, '8') < 0 { + $couchrest_version = '1.2' } - + else { + $couchrest_version = 'latest' + } + ensure_packages('ruby-dev') ensure_packages('couchrest', { provider => 'gem', diff --git a/spec/classes/couchdb_spec.rb b/spec/classes/couchdb_spec.rb index 0dd069a..e8e4174 100644 --- a/spec/classes/couchdb_spec.rb +++ b/spec/classes/couchdb_spec.rb @@ -5,7 +5,7 @@ describe 'couchdb' do let(:params) { {:admin_pw => 'foo'} } let(:facts) do { - :operatingsystemmajrelease => '7', + :operatingsystemrelease => '7', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', } @@ -20,7 +20,7 @@ describe 'couchdb' do let(:params) { {:admin_pw => 'foo'} } let(:facts) do { - :operatingsystemmajrelease => '8', + :operatingsystemrelease => '8', :operatingsystem => 'Debian', :lsbdistcodename => 'jessie', } |