stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #310 from enovance/bug/297/emilien

Browse Source 
telemetry: do not use mongodb primary node anymore
This commit is contained in:
Emilien Macchi 2014-03-03 18:47:45 +01:00
commit 10bb6d49a3
2 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/telemetry/server.pp
View File

@ -23,7 +23,6 @@ class cloud::telemetry::server(
$ks_ceilometer_password = $os_params::ks_ceilometer_password, $ks_ceilometer_password = $os_params::ks_ceilometer_password,
$api_eth = $os_params::api_eth, $api_eth = $os_params::api_eth,
$mongo_nodes = $os_params::mongo_nodes, $mongo_nodes = $os_params::mongo_nodes,
$mongo_primary = $os_params::mongo_primary,
){ ){
include 'cloud::telemetry' include 'cloud::telemetry'
@ -31,16 +30,10 @@ class cloud::telemetry::server(
$s_mongo_nodes = join($mongo_nodes, ',') $s_mongo_nodes = join($mongo_nodes, ',')
$db_conn = "mongodb://${s_mongo_nodes}/ceilometer?replicaSet=ceilometer" $db_conn = "mongodb://${s_mongo_nodes}/ceilometer?replicaSet=ceilometer"
if $::hostname == $mongo_primary {
$sync_db = true
} else {
$sync_db = false
}
# Install MongoDB database # Install MongoDB database
class { 'ceilometer::db': class { 'ceilometer::db':
database_connection => $db_conn, database_connection => $db_conn,
sync_db => $sync_db, sync_db => true,
require => Anchor['mongodb setup done'], require => Anchor['mongodb setup done'],
} }

27
spec/classes/cloud_telemetry_server_spec.rb
View File

@ -44,8 +44,7 @@ describe 'cloud::telemetry::server' do
:ks_ceilometer_internal_port => '8777', :ks_ceilometer_internal_port => '8777',
:ks_ceilometer_password => 'secrete', :ks_ceilometer_password => 'secrete',
:api_eth => '10.0.0.1', :api_eth => '10.0.0.1',
:mongo_nodes => ['node1', 'node2', 'node3'], :mongo_nodes => ['node1', 'node2', 'node3'] }
:mongo_primary => 'node1' }
end end
it 'configure ceilometer common' do it 'configure ceilometer common' do
@ -96,25 +95,11 @@ describe 'cloud::telemetry::server' do
) )
end end
context 'configure ceilometer db on primary mongodb node' do it 'synchronize ceilometer db indexes' do
it 'configure ceilometer db' do should contain_class('ceilometer::db').with(
should contain_class('ceilometer::db').with( :sync_db => true,
:sync_db => true, :database_connection => 'mongodb://node1,node2,node3/ceilometer?replicaSet=ceilometer'
:database_connection => 'mongodb://node1,node2,node3/ceilometer?replicaSet=ceilometer' )
)
end
end
context 'configure ceilometer db on secondary mongodb node' do
before :each do
facts.merge!( :hostname => 'node2' )
end
it 'configure ceilometer db' do
should contain_class('ceilometer::db').with(
:sync_db => false,
:database_connection => 'mongodb://node1,node2,node3/ceilometer?replicaSet=ceilometer'
)
end
end end
end end