stackforge/puppet-openstack-cloud
Code Issues Proposed changes

volume: disable cinder::glance

Browse Source 
Duplicate declaration: Cinder_config[DEFAULT/glance_api_version] is declared in file cinder/manifests/glance.pp and cinder/manifests/backend/rbd.pp

While https://review.openstack.org/#/c/69756/ got merged, this patch fix
the issue.

Close #111

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-01-29 15:34:26 +01:00
parent 884ce27642
commit 64617d398c
2 changed files with 25 additions and 13 deletions
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,
$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
# $backup_ceph_pool = $os_params::cinder_rbd_backup_pool,
# $backup_ceph_user = $os_params::cinder_rbd_backup_user
) {
include 'cloud::volume'
@@ -40,14 +40,20 @@ class cloud::volume::controller(
class { 'cinder::backup': }
# TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
#class { 'cinder::backup::ceph':
# backup_ceph_user => $backup_ceph_user,
# backup_ceph_pool => $backup_ceph_pool
#}
# class { 'cinder::backup::ceph':
# backup_ceph_user => $backup_ceph_user,
# backup_ceph_pool => $backup_ceph_pool
# }
class { 'cinder::glance':
glance_api_servers => $ks_glance_internal_host,
glance_request_timeout => '10'
# TODO(EmilienM) Disabled for now: http://git.io/uM5sgg
# class { 'cinder::glance':
# 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":

14
spec/classes/cloud_volume_controller_spec.rb
View File

@@ -66,11 +66,17 @@ describe 'cloud::volume::controller' do
should contain_class('cinder::scheduler')
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
should contain_class('cinder::glance').with(
:glance_api_servers => '10.0.0.1',
:glance_request_timeout => '10'
)
should contain_cinder_config('DEFAULT/glance_api_servers').with('value' => '10.0.0.1')
should contain_cinder_config('DEFAULT/glance_request_timeout').with('value' => '10')
end
it 'configure cinder api' do