stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Ceph: cosmetic

Browse Source 
Close bug #227

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-02-12 10:35:49 +01:00
parent 0365cd2d27
commit 663022a425
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/compute/hypervisor.pp
View File

@@ -36,7 +36,7 @@ class cloud::compute::hypervisor(
$spice_port = $os_params::spice_port, $spice_port = $os_params::spice_port,
$rbd_user = $os_params::cinder_rbd_user, $rbd_user = $os_params::cinder_rbd_user,
$rbd_pool = $os_params::cinder_rbd_pool, $rbd_pool = $os_params::cinder_rbd_pool,
$ceph_fsid = $os_params::ceph_fsid, $rbd_secret_uuid = $os_params::ceph_fsid,
$has_ceph = false $has_ceph = false
) { ) {
@@ -116,7 +116,7 @@ Host *
'DEFAULT/libvirt_images_rbd_pool': value => $rbd_pool; 'DEFAULT/libvirt_images_rbd_pool': value => $rbd_pool;
'DEFAULT/libvirt_images_rbd_ceph_conf': value => '/etc/ceph/ceph.conf'; 'DEFAULT/libvirt_images_rbd_ceph_conf': value => '/etc/ceph/ceph.conf';
'DEFAULT/rbd_user': value => $rbd_user; '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 # Extra config for nova-compute

4
manifests/volume/storage.pp
View File

@@ -20,7 +20,7 @@ class cloud::volume::storage(
$glance_api_version = $os_params::glance_api_version, $glance_api_version = $os_params::glance_api_version,
$cinder_rbd_pool = $os_params::cinder_rbd_pool, $cinder_rbd_pool = $os_params::cinder_rbd_pool,
$cinder_rbd_user = $os_params::cinder_rbd_user, $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' include 'cloud::volume'
@@ -31,7 +31,7 @@ class cloud::volume::storage(
rbd_pool => $cinder_rbd_pool, rbd_pool => $cinder_rbd_pool,
glance_api_version => $glance_api_version, glance_api_version => $glance_api_version,
rbd_user => $cinder_rbd_user, rbd_user => $cinder_rbd_user,
rbd_secret_uuid => $ceph_fsid rbd_secret_uuid => $cinder_rbd_secret_uuid
} }
Ceph::Key <<| title == $cinder_user |>> Ceph::Key <<| title == $cinder_user |>>

2
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@@ -48,7 +48,7 @@ describe 'cloud::compute::hypervisor' do
:has_ceph => true, :has_ceph => true,
:rbd_user => 'cinder', :rbd_user => 'cinder',
:rbd_pool => 'cinder', :rbd_pool => 'cinder',
:ceph_fsid => 'secrete', :rbd_secret_uuid => 'secrete',
:nova_ssh_private_key => 'secrete', :nova_ssh_private_key => 'secrete',
:nova_ssh_public_key => 'public', :nova_ssh_public_key => 'public',
:ks_nova_internal_proto => 'http', :ks_nova_internal_proto => 'http',

2
spec/classes/cloud_volume_storage_spec.rb
View File

@@ -40,7 +40,7 @@ describe 'cloud::volume::storage' do
let :params do let :params do
{ :cinder_rbd_pool => 'ceph_cinder', { :cinder_rbd_pool => 'ceph_cinder',
:cinder_rbd_user => 'cinder', :cinder_rbd_user => 'cinder',
:ceph_fsid => 'secrete', :cinder_rbd_secret_uuid => 'secrete',
:glance_api_version => '2' } :glance_api_version => '2' }
end end