stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #114 from enovance/bug/111/emilien

Browse Source 
volume: disable cinder::glance
This commit is contained in:
Yanis Guenane 2014-01-29 09:42:28 -08:00
commit 8f8d5a5f92
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
manifests/volume/controller.pp
View File

@ -23,8 +23,8 @@ class cloud::volume::controller(
$ks_glance_internal_host = $os_params::ks_glance_internal_host, $ks_glance_internal_host = $os_params::ks_glance_internal_host,
$api_eth = $os_params::api_eth, $api_eth = $os_params::api_eth,
# TODO(EmilienM) Disabled for now: http://git.io/kfTmcA # TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
#$backup_ceph_pool = $os_params::cinder_rbd_backup_pool, # $backup_ceph_pool = $os_params::cinder_rbd_backup_pool,
#$backup_ceph_user = $os_params::cinder_rbd_backup_user # $backup_ceph_user = $os_params::cinder_rbd_backup_user
) { ) {
include 'cloud::volume' include 'cloud::volume'
@ -40,14 +40,20 @@ class cloud::volume::controller(
class { 'cinder::backup': } class { 'cinder::backup': }
# TODO(EmilienM) Disabled for now: http://git.io/kfTmcA # TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
#class { 'cinder::backup::ceph': # class { 'cinder::backup::ceph':
# backup_ceph_user => $backup_ceph_user, # backup_ceph_user => $backup_ceph_user,
# backup_ceph_pool => $backup_ceph_pool # backup_ceph_pool => $backup_ceph_pool
#} # }
class { 'cinder::glance': # TODO(EmilienM) Disabled for now: http://git.io/uM5sgg
glance_api_servers => $ks_glance_internal_host, # class { 'cinder::glance':
glance_request_timeout => '10' # glance_api_servers => $ks_glance_internal_host,
# glance_request_timeout => '10'
# }
# Replaced by:
cinder_config {
'DEFAULT/glance_api_servers': value => $ks_glance_internal_host;
'DEFAULT/glance_request_timeout': value => '10';
} }
@@haproxy::balancermember{"${::fqdn}-cinder_api": @@haproxy::balancermember{"${::fqdn}-cinder_api":

14
spec/classes/cloud_volume_controller_spec.rb
View File

@ -64,11 +64,17 @@ describe 'cloud::volume::controller' do
should contain_class('cinder::scheduler') should contain_class('cinder::scheduler')
end end
# TODO(Emilien) Disabled for now: http://git.io/uM5sgg
# it 'configure cinder glance backend' do
# should contain_class('cinder::glance').with(
# :glance_api_servers => '10.0.0.1',
# :glance_request_timeout => '10'
# )
# end
# Replaced by:
it 'configure cinder glance backend' do it 'configure cinder glance backend' do
should contain_class('cinder::glance').with( should contain_cinder_config('DEFAULT/glance_api_servers').with('value' => '10.0.0.1')
:glance_api_servers => '10.0.0.1', should contain_cinder_config('DEFAULT/glance_request_timeout').with('value' => '10')
:glance_request_timeout => '10'
)
end end
it 'configure cinder api' do it 'configure cinder api' do