stackforge/puppet-openstack-cloud
Code Issues Proposed changes

nosql: set manage_package_repo to false on RH/CentOS

Browse Source 
MongoDB repository provides packages that do not support systemd
correctly on RHEL & CentOS, so we switched to RHCL & EPEL to have RH
supported packages.

When using them, we have to modify the way to use puppetlabs-mongodb by
disabling manage_package_repo to have good parameters.

For Debian & Ubuntu, no change this we continue to pin mongodb packages
to have recent ones.

This patch is only updating the way to use mongodb module on RH/CentOS.

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-08-24 11:20:45 +02:00
parent 2d0762606e
commit 2498a42fc0
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/database/nosql.pp
View File

@ -45,8 +45,17 @@ class cloud::database::nosql(
$array_bind_ip = any2array($bind_ip) $array_bind_ip = any2array($bind_ip)
$array_replset_members = any2array($replset_members) $array_replset_members = any2array($replset_members)
# Red Hat & CentOS use packages from RHCL or EPEL to support systemd
# so manage_package_repo should be at false regarding to mongodb module
if $::osfamily == 'RedHat' {
$manage_package_repo = false
} else {
# Debian & Ubuntu are picked from mongodb repo to get recent version
$manage_package_repo = true
}
class { 'mongodb::globals': class { 'mongodb::globals':
manage_package_repo => true manage_package_repo => $manage_package_repo
}-> }->
class { 'mongodb': class { 'mongodb':
bind_ip => $array_bind_ip, bind_ip => $array_bind_ip,

16
spec/classes/cloud_database_nosql_spec.rb
View File

@ -29,7 +29,7 @@ describe 'cloud::database::nosql' do
end end
it 'configure mongodb server' do it 'configure mongodb server' do
should contain_class('mongodb::globals').with( :manage_package_repo => true) should contain_class('mongodb::globals').with( :manage_package_repo => platform_params[:manage_package_repo])
should contain_class('mongodb::globals').with_before('Class[Mongodb]') should contain_class('mongodb::globals').with_before('Class[Mongodb]')
should contain_class('mongodb').with( should contain_class('mongodb').with(
:bind_ip => ['10.0.0.1'], :bind_ip => ['10.0.0.1'],
@ -54,10 +54,12 @@ describe 'cloud::database::nosql' do
context 'on Debian platforms' do context 'on Debian platforms' do
let :facts do let :facts do
{ { :osfamily => 'Debian',
:osfamily => 'Debian', :lsbdistid => 'Debian' }
:lsbdistid => 'Debian' end
}
let :platform_params do
{ :manage_package_repo => true }
end end
it_configures 'openstack database nosql' it_configures 'openstack database nosql'
@ -68,6 +70,10 @@ describe 'cloud::database::nosql' do
{ :osfamily => 'RedHat' } { :osfamily => 'RedHat' }
end end
let :platform_params do
{ :manage_package_repo => false }
end
it_configures 'openstack database nosql' it_configures 'openstack database nosql'
end end