From fac7521b69164cc3e1aa700336b858839b77268e Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 19 Mar 2014 09:21:59 +0100 Subject: [PATCH] cinder/glance: update to upstream class Previously, we used to configure Glance connection from Cinder using cinder_config type which is not the best way now since we have a new class: cinder::glance with good parameters. This patch aims to update our module to use this class. Bug #111 Signed-off-by: Emilien Macchi --- manifests/volume/controller.pp | 12 +++--------- spec/classes/cloud_volume_controller_spec.rb | 16 +++++----------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/manifests/volume/controller.pp b/manifests/volume/controller.pp index 85e7e120..de54d9f2 100644 --- a/manifests/volume/controller.pp +++ b/manifests/volume/controller.pp @@ -56,15 +56,9 @@ class cloud::volume::controller( # backup_ceph_pool => $backup_ceph_pool # } - # 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}:${ks_glance_api_internal_port}"; - 'DEFAULT/glance_request_timeout': value => '10'; + class { 'cinder::glance': + glance_api_servers => "${ks_glance_internal_host}:${ks_glance_api_internal_port}", + glance_request_timeout => '10' } @@haproxy::balancermember{"${::fqdn}-cinder_api": diff --git a/spec/classes/cloud_volume_controller_spec.rb b/spec/classes/cloud_volume_controller_spec.rb index 475a1fd6..47bcaf6a 100644 --- a/spec/classes/cloud_volume_controller_spec.rb +++ b/spec/classes/cloud_volume_controller_spec.rb @@ -41,7 +41,7 @@ describe 'cloud::volume::controller' 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_glance_internal_host => '10.0.0.2', :ks_glance_api_internal_port => '9292', :volume_multi_backend => false, # TODO(EmilienM) Disabled for now: http://git.io/kfTmcA @@ -89,17 +89,11 @@ describe 'cloud::volume::controller' do 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 - 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') + should contain_class('cinder::glance').with( + :glance_api_servers => '10.0.0.2:9292', + :glance_request_timeout => '10' + ) end it 'configure cinder api' do