stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Fix Re-arrange variable declaration with glance/ceph

Browse Source 
Refs: GH-80 (GH-82) and openstack-puppet-ci-#23
Closes: GH-84
This commit is contained in:
Sebastien Badia 2014-01-28 12:25:48 +01:00
parent b3259ca98e
commit 5af106c4f3
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/image.pp
View File

@ -66,8 +66,8 @@ class cloud::image(
$rabbit_password = $os_params::rabbit_password,
$rabbit_host = $os_params::rabbit_hosts[0],
$api_eth = $os_params::api_eth,
$rbd_store_pool = 'ceph_glance',
$rbd_store_user = 'glance',
$rbd_store_pool = $os_params::glance_rbd_pool,
$rbd_store_user = $os_params::glance_rbd_user,
$verbose = $os_params::verbose,
$debug = $os_params::debug
) {
@ -94,7 +94,6 @@ class cloud::image(
rabbit_host => $rabbit_host,
}
# TODO(EmilienM) We should migrate the backend to Ceph (WIP). For now, I let Swift.
class { 'glance::backend::rbd':
rbd_store_user => $rbd_store_user,
rbd_store_pool => $rbd_store_pool

2
spec/classes/cloud_image_spec.rb
View File

@ -32,7 +32,7 @@ describe 'cloud::image' do
:rabbit_host => '10.0.0.1',
:rabbit_password => 'secrete',
:rbd_store_user => 'glance',
:rbd_store_pool => 'ceph_glance',
:rbd_store_pool => 'images',
:debug => true,
:verbose => true,
:api_eth => '10.0.0.1' }