stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #506 from enovance/glance-timeout

Browse Source 
Increase glance_num_retries for Glance and Cinder
This commit is contained in:
François Charlier 2014-06-10 12:01:34 +02:00
commit a1d6853552
11 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/compute.pp
View File

@ -129,6 +129,7 @@ class cloud::compute(
'DEFAULT/resume_guests_state_on_host_boot': value => true;
'DEFAULT/default_availability_zone': value => $availability_zone;
'DEFAULT/servicegroup_driver': value => 'mc';
'DEFAULT/glance_num_retries': value => '10';
}
# Note(EmilienM):

3
manifests/volume/api.pp
View File

@ -49,7 +49,8 @@ class cloud::volume::api(
class { 'cinder::glance':
glance_api_servers => "${ks_glance_internal_host}:${ks_glance_api_internal_port}",
glance_request_timeout => '10'
glance_request_timeout => '10',
glance_num_retries => '10'
}
@@haproxy::balancermember{"${::fqdn}-cinder_api":

1
spec/classes/cloud_compute_api_spec.rb
View File

@ -71,6 +71,7 @@ describe 'cloud::compute::api' do
should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true)
should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')
should contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc')
should contain_nova_config('DEFAULT/glance_num_retries').with_value('10')
end
it 'configure neutron on compute node' do

1
spec/classes/cloud_compute_cert_spec.rb
View File

@ -61,6 +61,7 @@ describe 'cloud::compute::cert' do
should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true)
should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')
should contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc')
should contain_nova_config('DEFAULT/glance_num_retries').with_value('10')
end
it 'configure neutron on compute node' do

1
spec/classes/cloud_compute_conductor_spec.rb
View File

@ -61,6 +61,7 @@ describe 'cloud::compute::conductor' do
should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true)
should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')
should contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc')
should contain_nova_config('DEFAULT/glance_num_retries').with_value('10')
end
it 'configure neutron on compute node' do

1
spec/classes/cloud_compute_consoleauth_spec.rb
View File

@ -61,6 +61,7 @@ describe 'cloud::compute::consoleauth' do
should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true)
should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')
should contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc')
should contain_nova_config('DEFAULT/glance_num_retries').with_value('10')
end
it 'configure neutron on compute node' do

1
spec/classes/cloud_compute_consoleproxy_spec.rb
View File

@ -66,6 +66,7 @@ describe 'cloud::compute::consoleproxy' do
should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true)
should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')
should contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc')
should contain_nova_config('DEFAULT/glance_num_retries').with_value('10')
end
it 'configure neutron on compute node' do

1
spec/classes/cloud_compute_controller_spec.rb
View File

@ -72,6 +72,7 @@ describe 'cloud::compute::controller' do
should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true)
should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')
should contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc')
should contain_nova_config('DEFAULT/glance_num_retries').with_value('10')
end
it 'configure neutron on compute node' do

1
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@ -97,6 +97,7 @@ describe 'cloud::compute::hypervisor' do
should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true)
should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')
should contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc')
should contain_nova_config('DEFAULT/glance_num_retries').with_value('10')
end
it 'configure neutron on compute node' do

1
spec/classes/cloud_compute_scheduler_spec.rb
View File

@ -61,6 +61,7 @@ describe 'cloud::compute::scheduler' do
should contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with('value' => true)
should contain_nova_config('DEFAULT/default_availability_zone').with('value' => 'MyZone')
should contain_nova_config('DEFAULT/servicegroup_driver').with_value('mc')
should contain_nova_config('DEFAULT/glance_num_retries').with_value('10')
end
it 'configure neutron on compute node' do

3
spec/classes/cloud_volume_controller_spec.rb
View File

@ -110,7 +110,8 @@ describe 'cloud::volume::controller' do
it 'configure cinder glance backend' do
should contain_class('cinder::glance').with(
:glance_api_servers => '10.0.0.2:9292',
:glance_request_timeout => '10'
:glance_request_timeout => '10',
:glance_num_retries => '10'
)
end