stackforge/puppet-openstack-cloud
Code Issues Proposed changes

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

Browse Source 
cinder/glance: update to upstream class
This commit is contained in:
Sebastien Badia
2014-03-19 11:34:33 +01:00
parent 960b9e0bb4 fac7521b69
commit 9c8c1bd2f6
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/volume/controller.pp
View File

@@ -56,15 +56,9 @@ class cloud::volume::controller(
# backup_ceph_pool => $backup_ceph_pool # backup_ceph_pool => $backup_ceph_pool
# } # }
# TODO(EmilienM) Disabled for now: http://git.io/uM5sgg class { 'cinder::glance':
# class { 'cinder::glance': glance_api_servers => "${ks_glance_internal_host}:${ks_glance_api_internal_port}",
# glance_api_servers => $ks_glance_internal_host, glance_request_timeout => '10'
# glance_request_timeout => '10'
# }
# Replaced by:
cinder_config {
'DEFAULT/glance_api_servers': value => "${ks_glance_internal_host}:${ks_glance_api_internal_port}";
'DEFAULT/glance_request_timeout': value => '10';
} }
@@haproxy::balancermember{"${::fqdn}-cinder_api": @@haproxy::balancermember{"${::fqdn}-cinder_api":

16
spec/classes/cloud_volume_controller_spec.rb
View File

@@ -41,7 +41,7 @@ describe 'cloud::volume::controller' do
{ :ks_cinder_password => 'secrete', { :ks_cinder_password => 'secrete',
:ks_cinder_internal_port => '8776', :ks_cinder_internal_port => '8776',
:ks_keystone_internal_host => '10.0.0.1', :ks_keystone_internal_host => '10.0.0.1',
:ks_glance_internal_host => '10.0.0.1', :ks_glance_internal_host => '10.0.0.2',
:ks_glance_api_internal_port => '9292', :ks_glance_api_internal_port => '9292',
:volume_multi_backend => false, :volume_multi_backend => false,
# TODO(EmilienM) Disabled for now: http://git.io/kfTmcA # TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
@@ -89,17 +89,11 @@ describe 'cloud::volume::controller' do
end end
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_cinder_config('DEFAULT/glance_api_servers').with('value' => '10.0.0.1:9292') should contain_class('cinder::glance').with(
should contain_cinder_config('DEFAULT/glance_request_timeout').with('value' => '10') :glance_api_servers => '10.0.0.2:9292',
:glance_request_timeout => '10'
)
end end
it 'configure cinder api' do it 'configure cinder api' do