stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #266 from enovance/bug/265/leseb

Browse Source 
cinder: fix create a volume from an image
This commit is contained in:
Emilien Macchi 2014-02-18 15:39:42 +01:00
commit 606d4ee0fd
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/volume/controller.pp
View File

@ -17,11 +17,12 @@
#
class cloud::volume::controller(
$ks_cinder_internal_port = $os_params::ks_cinder_internal_port,
$ks_cinder_password = $os_params::ks_cinder_password,
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
$ks_glance_internal_host = $os_params::ks_glance_internal_host,
$api_eth = $os_params::api_eth,
$ks_cinder_internal_port = $os_params::ks_cinder_internal_port,
$ks_cinder_password = $os_params::ks_cinder_password,
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
$ks_glance_internal_host = $os_params::ks_glance_internal_host,
$ks_glance_api_internal_port = $os_params::ks_glance_api_internal_port,
$api_eth = $os_params::api_eth,
# TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
# $backup_ceph_pool = $os_params::cinder_rbd_backup_pool,
# $backup_ceph_user = $os_params::cinder_rbd_backup_user
@ -52,7 +53,7 @@ class cloud::volume::controller(
# }
# Replaced by:
cinder_config {
'DEFAULT/glance_api_servers': value => $ks_glance_internal_host;
'DEFAULT/glance_api_servers': value => "${ks_glance_internal_host}:${ks_glance_api_internal_port}";
'DEFAULT/glance_request_timeout': value => '10';
}

17
spec/classes/cloud_volume_controller_spec.rb
View File

@ -38,14 +38,15 @@ describe 'cloud::volume::controller' do
end
let :params do
{ :ks_cinder_password => 'secrete',
:ks_cinder_internal_port => '8776',
:ks_keystone_internal_host => '10.0.0.1',
:ks_glance_internal_host => '10.0.0.1',
{ :ks_cinder_password => 'secrete',
:ks_cinder_internal_port => '8776',
:ks_keystone_internal_host => '10.0.0.1',
:ks_glance_internal_host => '10.0.0.1',
:ks_glance_api_internal_port => '9292',
# TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
#:backup_ceph_user => 'cinder',
#:backup_ceph_pool => 'ceph_backup_cinder',
:api_eth => '10.0.0.1' }
#:backup_ceph_user => 'cinder',
#:backup_ceph_pool => 'ceph_backup_cinder',
:api_eth => '10.0.0.1' }
end
it 'configure cinder common' do
@ -82,7 +83,7 @@ describe 'cloud::volume::controller' do
# end
# Replaced by:
it 'configure cinder glance backend' do
should contain_cinder_config('DEFAULT/glance_api_servers').with('value' => '10.0.0.1')
should contain_cinder_config('DEFAULT/glance_api_servers').with('value' => '10.0.0.1:9292')
should contain_cinder_config('DEFAULT/glance_request_timeout').with('value' => '10')
end