openstack/puppet-ceilometer
Code Issues Proposed changes

Merge "changed rabbit_virtualhost(wrong) to rabbit_virtual_host"

Browse Source
This commit is contained in:
Jenkins 2013-11-13 10:49:16 +00:00 committed by Gerrit Code Review
commit 7ac2d80c4e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
View File

@ -26,7 +26,7 @@
# user to connect to the rabbit server. Optional. Defaults to 'guest' # user to connect to the rabbit server. Optional. Defaults to 'guest'
# [*rabbit_password*] # [*rabbit_password*]
# password to connect to the rabbit_server. Optional. Defaults to empty. # password to connect to the rabbit_server. Optional. Defaults to empty.
# [*rabbit_virtualhost*] # [*rabbit_virtual_host*]
# virtualhost to use. Optional. Defaults to '/' # virtualhost to use. Optional. Defaults to '/'
# #
# [*qpid_hostname*] # [*qpid_hostname*]
@ -56,7 +56,7 @@ class ceilometer(
$rabbit_hosts = undef, $rabbit_hosts = undef,
$rabbit_userid = 'guest', $rabbit_userid = 'guest',
$rabbit_password = '', $rabbit_password = '',
$rabbit_virtualhost = '/', $rabbit_virtual_host = '/',
$qpid_hostname = 'localhost', $qpid_hostname = 'localhost',
$qpid_port = 5672, $qpid_port = 5672,
$qpid_username = 'guest', $qpid_username = 'guest',
@ -139,7 +139,7 @@ class ceilometer(
ceilometer_config { ceilometer_config {
'DEFAULT/rabbit_userid' : value => $rabbit_userid; 'DEFAULT/rabbit_userid' : value => $rabbit_userid;
'DEFAULT/rabbit_password' : value => $rabbit_password; 'DEFAULT/rabbit_password' : value => $rabbit_password;
'DEFAULT/rabbit_virtualhost' : value => $rabbit_virtualhost; 'DEFAULT/rabbit_virtual_host' : value => $rabbit_virtual_host;
} }
} }

8
spec/classes/ceilometer_init_spec.rb
View File

@ -17,7 +17,7 @@ describe 'ceilometer' do
:rabbit_port => 5672, :rabbit_port => 5672,
:rabbit_userid => 'guest', :rabbit_userid => 'guest',
:rabbit_password => '', :rabbit_password => '',
:rabbit_virtualhost => '/', :rabbit_virtual_host => '/',
} }
end end
@ -136,7 +136,7 @@ describe 'ceilometer' do
it 'configures rabbit' do it 'configures rabbit' do
should contain_ceilometer_config('DEFAULT/rabbit_userid').with_value( params[:rabbit_userid] ) should contain_ceilometer_config('DEFAULT/rabbit_userid').with_value( params[:rabbit_userid] )
should contain_ceilometer_config('DEFAULT/rabbit_password').with_value( params[:rabbit_password] ) should contain_ceilometer_config('DEFAULT/rabbit_password').with_value( params[:rabbit_password] )
should contain_ceilometer_config('DEFAULT/rabbit_virtualhost').with_value( params[:rabbit_virtualhost] ) should contain_ceilometer_config('DEFAULT/rabbit_virtual_host').with_value( params[:rabbit_virtual_host] )
end end
it { should contain_ceilometer_config('DEFAULT/rabbit_host').with_value( params[:rabbit_host] ) } it { should contain_ceilometer_config('DEFAULT/rabbit_host').with_value( params[:rabbit_host] ) }
@ -150,7 +150,7 @@ describe 'ceilometer' do
it 'configures rabbit' do it 'configures rabbit' do
should contain_ceilometer_config('DEFAULT/rabbit_userid').with_value( params[:rabbit_userid] ) should contain_ceilometer_config('DEFAULT/rabbit_userid').with_value( params[:rabbit_userid] )
should contain_ceilometer_config('DEFAULT/rabbit_password').with_value( params[:rabbit_password] ) should contain_ceilometer_config('DEFAULT/rabbit_password').with_value( params[:rabbit_password] )
should contain_ceilometer_config('DEFAULT/rabbit_virtualhost').with_value( params[:rabbit_virtualhost] ) should contain_ceilometer_config('DEFAULT/rabbit_virtual_host').with_value( params[:rabbit_virtual_host] )
end end
it { should contain_ceilometer_config('DEFAULT/rabbit_host').with_ensure('absent') } it { should contain_ceilometer_config('DEFAULT/rabbit_host').with_ensure('absent') }
@ -164,7 +164,7 @@ describe 'ceilometer' do
it 'configures rabbit' do it 'configures rabbit' do
should contain_ceilometer_config('DEFAULT/rabbit_userid').with_value( params[:rabbit_userid] ) should contain_ceilometer_config('DEFAULT/rabbit_userid').with_value( params[:rabbit_userid] )
should contain_ceilometer_config('DEFAULT/rabbit_password').with_value( params[:rabbit_password] ) should contain_ceilometer_config('DEFAULT/rabbit_password').with_value( params[:rabbit_password] )
should contain_ceilometer_config('DEFAULT/rabbit_virtualhost').with_value( params[:rabbit_virtualhost] ) should contain_ceilometer_config('DEFAULT/rabbit_virtual_host').with_value( params[:rabbit_virtual_host] )
end end
it { should contain_ceilometer_config('DEFAULT/rabbit_host').with_ensure('absent') } it { should contain_ceilometer_config('DEFAULT/rabbit_host').with_ensure('absent') }