From a0dd091a72d6e26f93f884462e0b5708bb64f83e Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Sun, 13 Apr 2014 16:56:29 +0200 Subject: [PATCH] mongodb: manage manage_package_repo on RHEL manage_package_repo should be set to true, otherwise mongodb module is not aware about Packaging specifications on RHEL. Bug #408 Signed-off-by: Emilien Macchi --- manifests/database/nosql.pp | 7 +------ spec/classes/cloud_database_nosql_spec.rb | 3 +-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/manifests/database/nosql.pp b/manifests/database/nosql.pp index 2db7dc2e..fd09d5ef 100644 --- a/manifests/database/nosql.pp +++ b/manifests/database/nosql.pp @@ -44,13 +44,8 @@ class cloud::database::nosql( # bind_ip should be an array $bind_ip_real = any2array($bind_ip) - $manage_mongodb_package_repo = $::osfamily ? { - 'RedHat' => false, - default => true - } - class { 'mongodb::globals': - manage_package_repo => $manage_mongodb_package_repo + manage_package_repo => true }-> class { 'mongodb': bind_ip => $bind_ip_real, diff --git a/spec/classes/cloud_database_nosql_spec.rb b/spec/classes/cloud_database_nosql_spec.rb index c63f6042..0c5db71b 100644 --- a/spec/classes/cloud_database_nosql_spec.rb +++ b/spec/classes/cloud_database_nosql_spec.rb @@ -29,6 +29,7 @@ describe 'cloud::database::nosql' do end it 'configure mongodb server' do + should contain_class('mongodb::globals').with( :manage_package_repo => true) should contain_class('mongodb::globals').with_before('Class[Mongodb]') should contain_class('mongodb').with( :bind_ip => ['10.0.0.1'], @@ -58,7 +59,6 @@ describe 'cloud::database::nosql' do } end - it { should contain_class('mongodb::globals').with( :manage_package_repo => true) } it_configures 'openstack database nosql' end @@ -67,7 +67,6 @@ describe 'cloud::database::nosql' do { :osfamily => 'RedHat' } end - it { should contain_class('mongodb::globals').with( :manage_package_repo => false) } it_configures 'openstack database nosql' end