From b4c47a598d11810ddfc2bf59a1e956b84e1ad242 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 11 Feb 2014 17:07:03 +0100 Subject: [PATCH] compute/hypervisor: Fix Ceph configuration Close bug #87 Signed-off-by: Emilien Macchi --- manifests/compute/hypervisor.pp | 9 ++++++--- spec/classes/cloud_compute_hypervisor_spec.rb | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp index fa8fd05c..004756e3 100644 --- a/manifests/compute/hypervisor.pp +++ b/manifests/compute/hypervisor.pp @@ -34,6 +34,9 @@ class cloud::compute::hypervisor( $nova_ssh_private_key = $os_params::nova_ssh_private_key, $nova_ssh_public_key = $os_params::nova_ssh_public_key, $spice_port = $os_params::spice_port, + $rbd_user = $os_params::cinder_rbd_user, + $rbd_pool = $os_params::cinder_rbd_pool, + $rbd_secret_uuid = $os_params::cinder_rbd_secret_uuid, $has_ceph = false ) { @@ -111,10 +114,10 @@ Host * # TODO(EmilienM) Temporary, while https://review.openstack.org/#/c/72440 got merged nova_config { 'DEFAULT/libvirt_images_type': value => 'rbd'; - 'DEFAULT/libvirt_images_rbd_pool': value => 'nova'; + 'DEFAULT/libvirt_images_rbd_pool': value => $rbd_pool; 'DEFAULT/libvirt_images_rbd_ceph_conf': value => '/etc/ceph/ceph.conf'; - 'DEFAULT/rbd_user': value => 'nova'; - 'DEFAULT/rbd_secret_uuid': value => 'secrete'; + 'DEFAULT/rbd_user': value => $rbd_user; + 'DEFAULT/rbd_secret_uuid': value => $rbd_secret_uuid; } # Extra config for nova-compute diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index ff79b87c..db4088f0 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -54,6 +54,9 @@ describe 'cloud::compute::hypervisor' do :server_proxyclient_address => '7.0.0.1', :spice_port => '6082', :has_ceph => true, + :rbd_user => 'cinder', + :rbd_pool => 'cinder', + :rbd_secret_uuid => 'secrete', :nova_ssh_private_key => 'secrete', :nova_ssh_public_key => 'public', :ks_nova_internal_proto => 'http', @@ -142,9 +145,9 @@ describe 'cloud::compute::hypervisor' do 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' => 'nova') + should contain_nova_config('DEFAULT/libvirt_images_rbd_pool').with('value' => 'cinder') should contain_nova_config('DEFAULT/libvirt_images_rbd_ceph_conf').with('value' => '/etc/ceph/ceph.conf') - should contain_nova_config('DEFAULT/rbd_user').with('value' => 'nova') + should contain_nova_config('DEFAULT/rbd_user').with('value' => 'cinder') should contain_nova_config('DEFAULT/rbd_secret_uuid').with('value' => 'secrete') should contain_nova_config('DEFAULT/libvirt_inject_key').with('value' => false) should contain_nova_config('DEFAULT/libvirt_inject_partition').with('value' => '-2')