stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #218 from enovance/bug/217/emilien

Browse Source 
compute/hypervisor: Add Ceilometer Agent Compute support
This commit is contained in:
François Charlier
2014-02-14 19:09:20 +01:00
parent 5fad3d9c66 55d6ad3ccc
commit 7ba2af42f3
2 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/compute/hypervisor.pp
View File

@@ -42,6 +42,7 @@ class cloud::compute::hypervisor(
) {
include 'cloud::compute'
include 'cloud::telemetry'
exec { 'insert_module_nbd':
command => '/bin/echo "nbd" > /etc/modules',
@@ -133,4 +134,6 @@ Host *
Exec <<| tag == 'set_secret_value_virsh' |>>
}
class { 'ceilometer::agent::compute': }
}

61
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@@ -38,7 +38,19 @@ describe 'cloud::compute::hypervisor' do
neutron_endpoint => '10.0.0.1',
neutron_region_name => 'MyRegion',
neutron_password => 'secrete',
log_facility => 'LOG_LOCAL0' }"
log_facility => 'LOG_LOCAL0' }
class { 'cloud::telemetry':
ceilometer_secret => 'secrete',
rabbit_hosts => ['10.0.0.1'],
rabbit_password => 'secrete',
ks_keystone_internal_host => '10.0.0.1',
ks_keystone_internal_port => '5000',
ks_keystone_internal_proto => 'http',
ks_ceilometer_password => 'secrete',
log_facility => 'LOG_LOCAL0',
use_syslog => true,
verbose => true,
debug => true }"
end
let :params do
@@ -78,6 +90,49 @@ describe 'cloud::compute::hypervisor' do
:neutron_admin_auth_url => 'http://10.0.0.1:35357/v2.0',
:neutron_region_name => 'MyRegion',
:neutron_url => 'http://10.0.0.1:9696'
)
end
it 'configure ceilometer common' do
should contain_class('ceilometer').with(
:verbose => true,
:debug => true,
:rabbit_userid => 'ceilometer',
:rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete',
:metering_secret => 'secrete',
:use_syslog => true,
:log_facility => 'LOG_LOCAL0'
)
should contain_class('ceilometer::agent::auth').with(
:auth_password => 'secrete',
:auth_url => 'http://10.0.0.1:5000/v2.0'
)
end
it 'configure neutron on compute node' do
should contain_class('nova::network::neutron').with(
:neutron_admin_password => 'secrete',
:neutron_admin_auth_url => 'http://10.0.0.1:35357/v2.0',
:neutron_region_name => 'MyRegion',
:neutron_url => 'http://10.0.0.1:9696'
)
end
it 'configure ceilometer common' do
should contain_class('ceilometer').with(
:verbose => true,
:debug => true,
:rabbit_userid => 'ceilometer',
:rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete',
:metering_secret => 'secrete',
:use_syslog => true,
:log_facility => 'LOG_LOCAL0'
)
should contain_class('ceilometer::agent::auth').with(
:auth_password => 'secrete',
:auth_url => 'http://10.0.0.1:5000/v2.0'
)
end
@@ -124,6 +179,10 @@ describe 'cloud::compute::hypervisor' do
should contain_class('nova::compute::neutron')
end
it 'configure ceilometer agent compute' do
should contain_class('ceilometer::agent::compute')
end
it 'configure nova-conpute to support RBD backend' do
should contain_nova_config('DEFAULT/libvirt_images_type').with('value' => 'rbd')
should contain_nova_config('DEFAULT/libvirt_images_rbd_pool').with('value' => 'cinder')