From 0365cd2d2769457beb233b9b8b4eb065e4d2c96f Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 12 Feb 2014 10:20:10 +0100 Subject: [PATCH 1/2] Use ceph_fsid param only everywhere Close bug #227 Signed-off-by: Emilien Macchi --- manifests/compute/hypervisor.pp | 4 ++-- manifests/volume/storage.pp | 4 ++-- spec/classes/cloud_compute_hypervisor_spec.rb | 2 +- spec/classes/cloud_volume_storage_spec.rb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp index 34b37375..b5c0dc8b 100644 --- a/manifests/compute/hypervisor.pp +++ b/manifests/compute/hypervisor.pp @@ -36,7 +36,7 @@ class cloud::compute::hypervisor( $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, + $ceph_fsid = $os_params::ceph_fsid, $has_ceph = false ) { @@ -116,7 +116,7 @@ Host * 'DEFAULT/libvirt_images_rbd_pool': value => $rbd_pool; 'DEFAULT/libvirt_images_rbd_ceph_conf': value => '/etc/ceph/ceph.conf'; 'DEFAULT/rbd_user': value => $rbd_user; - 'DEFAULT/rbd_secret_uuid': value => $rbd_secret_uuid; + 'DEFAULT/rbd_secret_uuid': value => $ceph_fsid; } # Extra config for nova-compute diff --git a/manifests/volume/storage.pp b/manifests/volume/storage.pp index 4ad936ae..7137a247 100644 --- a/manifests/volume/storage.pp +++ b/manifests/volume/storage.pp @@ -20,7 +20,7 @@ class cloud::volume::storage( $glance_api_version = $os_params::glance_api_version, $cinder_rbd_pool = $os_params::cinder_rbd_pool, $cinder_rbd_user = $os_params::cinder_rbd_user, - $cinder_rbd_secret_uuid = $os_params::cinder_rbd_secret_uuid, + $ceph_fsid = $os_params::ceph_fsid, ) { include 'cloud::volume' @@ -31,7 +31,7 @@ class cloud::volume::storage( rbd_pool => $cinder_rbd_pool, glance_api_version => $glance_api_version, rbd_user => $cinder_rbd_user, - rbd_secret_uuid => $cinder_rbd_secret_uuid + rbd_secret_uuid => $ceph_fsid } Ceph::Key <<| title == $cinder_user |>> diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index 5a0045d1..8d4add47 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -48,7 +48,7 @@ describe 'cloud::compute::hypervisor' do :has_ceph => true, :rbd_user => 'cinder', :rbd_pool => 'cinder', - :rbd_secret_uuid => 'secrete', + :ceph_fsid => 'secrete', :nova_ssh_private_key => 'secrete', :nova_ssh_public_key => 'public', :ks_nova_internal_proto => 'http', diff --git a/spec/classes/cloud_volume_storage_spec.rb b/spec/classes/cloud_volume_storage_spec.rb index a0998748..21505b37 100644 --- a/spec/classes/cloud_volume_storage_spec.rb +++ b/spec/classes/cloud_volume_storage_spec.rb @@ -40,7 +40,7 @@ describe 'cloud::volume::storage' do let :params do { :cinder_rbd_pool => 'ceph_cinder', :cinder_rbd_user => 'cinder', - :cinder_rbd_secret_uuid => 'secrete', + :ceph_fsid => 'secrete', :glance_api_version => '2' } end From 663022a4258ebb82b157ce5a395fd41b7b3e9dad Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 12 Feb 2014 10:35:49 +0100 Subject: [PATCH 2/2] Ceph: cosmetic Close bug #227 Signed-off-by: Emilien Macchi --- manifests/compute/hypervisor.pp | 4 ++-- manifests/volume/storage.pp | 4 ++-- spec/classes/cloud_compute_hypervisor_spec.rb | 2 +- spec/classes/cloud_volume_storage_spec.rb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp index b5c0dc8b..1fe9d11d 100644 --- a/manifests/compute/hypervisor.pp +++ b/manifests/compute/hypervisor.pp @@ -36,7 +36,7 @@ class cloud::compute::hypervisor( $spice_port = $os_params::spice_port, $rbd_user = $os_params::cinder_rbd_user, $rbd_pool = $os_params::cinder_rbd_pool, - $ceph_fsid = $os_params::ceph_fsid, + $rbd_secret_uuid = $os_params::ceph_fsid, $has_ceph = false ) { @@ -116,7 +116,7 @@ Host * 'DEFAULT/libvirt_images_rbd_pool': value => $rbd_pool; 'DEFAULT/libvirt_images_rbd_ceph_conf': value => '/etc/ceph/ceph.conf'; 'DEFAULT/rbd_user': value => $rbd_user; - 'DEFAULT/rbd_secret_uuid': value => $ceph_fsid; + 'DEFAULT/rbd_secret_uuid': value => $rbd_secret_uuid; } # Extra config for nova-compute diff --git a/manifests/volume/storage.pp b/manifests/volume/storage.pp index 7137a247..b1922b7b 100644 --- a/manifests/volume/storage.pp +++ b/manifests/volume/storage.pp @@ -20,7 +20,7 @@ class cloud::volume::storage( $glance_api_version = $os_params::glance_api_version, $cinder_rbd_pool = $os_params::cinder_rbd_pool, $cinder_rbd_user = $os_params::cinder_rbd_user, - $ceph_fsid = $os_params::ceph_fsid, + $cinder_rbd_secret_uuid = $os_params::ceph_fsid, ) { include 'cloud::volume' @@ -31,7 +31,7 @@ class cloud::volume::storage( rbd_pool => $cinder_rbd_pool, glance_api_version => $glance_api_version, rbd_user => $cinder_rbd_user, - rbd_secret_uuid => $ceph_fsid + rbd_secret_uuid => $cinder_rbd_secret_uuid } Ceph::Key <<| title == $cinder_user |>> diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index 8d4add47..5a0045d1 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -48,7 +48,7 @@ describe 'cloud::compute::hypervisor' do :has_ceph => true, :rbd_user => 'cinder', :rbd_pool => 'cinder', - :ceph_fsid => 'secrete', + :rbd_secret_uuid => 'secrete', :nova_ssh_private_key => 'secrete', :nova_ssh_public_key => 'public', :ks_nova_internal_proto => 'http', diff --git a/spec/classes/cloud_volume_storage_spec.rb b/spec/classes/cloud_volume_storage_spec.rb index 21505b37..a0998748 100644 --- a/spec/classes/cloud_volume_storage_spec.rb +++ b/spec/classes/cloud_volume_storage_spec.rb @@ -40,7 +40,7 @@ describe 'cloud::volume::storage' do let :params do { :cinder_rbd_pool => 'ceph_cinder', :cinder_rbd_user => 'cinder', - :ceph_fsid => 'secrete', + :cinder_rbd_secret_uuid => 'secrete', :glance_api_version => '2' } end