Merge "Add support for consecutive_build_service_disable_threshold"

This commit is contained in:
Jenkins
2017-08-25 01:59:46 +00:00
committed by Gerrit Code Review
3 changed files with 46 additions and 30 deletions

View File

@@ -144,6 +144,11 @@
# (optional) Maximum number of live migrations to run in parallel. # (optional) Maximum number of live migrations to run in parallel.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*consecutive_build_service_disable_threshold*]
# (optional) Max number of consecutive build failures before the nova-compute
# will disable itself.
# Defaults to $::os_service_default
#
class nova::compute ( class nova::compute (
$enabled = true, $enabled = true,
$manage_service = true, $manage_service = true,
@@ -175,6 +180,7 @@ class nova::compute (
$barbican_endpoint = $::os_service_default, $barbican_endpoint = $::os_service_default,
$barbican_api_version = $::os_service_default, $barbican_api_version = $::os_service_default,
$max_concurrent_live_migrations = $::os_service_default, $max_concurrent_live_migrations = $::os_service_default,
$consecutive_build_service_disable_threshold = $::os_service_default,
) { ) {
include ::nova::deps include ::nova::deps
@@ -213,6 +219,8 @@ class nova::compute (
'barbican/barbican_endpoint': value => $barbican_endpoint; 'barbican/barbican_endpoint': value => $barbican_endpoint;
'barbican/barbican_api_version': value => $barbican_api_version; 'barbican/barbican_api_version': value => $barbican_api_version;
'DEFAULT/max_concurrent_live_migrations': value => $max_concurrent_live_migrations; 'DEFAULT/max_concurrent_live_migrations': value => $max_concurrent_live_migrations;
'compute/consecutive_build_service_disable_threshold':
value => $consecutive_build_service_disable_threshold;
} }
ensure_resource('nova_config', 'DEFAULT/allow_resize_to_same_host', { value => $allow_resize_to_same_host }) ensure_resource('nova_config', 'DEFAULT/allow_resize_to_same_host', { value => $allow_resize_to_same_host })

View File

@@ -0,0 +1,4 @@
---
features: |
- Add ability to configure compute/consecutive_build_service_disable_threshold
on the compute notes.

View File

@@ -34,6 +34,7 @@ describe 'nova::compute' do
it { is_expected.to contain_nova_config('barbican/barbican_api_version').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_nova_config('barbican/barbican_api_version').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('barbican/auth_endpoint').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_nova_config('barbican/auth_endpoint').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('DEFAULT/max_concurrent_live_migrations').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_nova_config('DEFAULT/max_concurrent_live_migrations').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('compute/consecutive_build_service_disable_threshold').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('pci/passthrough_whitelist').with(:value => '<SERVICE DEFAULT>') } it { is_expected.to contain_nova_config('pci/passthrough_whitelist').with(:value => '<SERVICE DEFAULT>') }
it { is_expected.to_not contain_package('cryptsetup').with( :ensure => 'present' )} it { is_expected.to_not contain_package('cryptsetup').with( :ensure => 'present' )}
@@ -79,6 +80,7 @@ describe 'nova::compute' do
:barbican_api_version => 'v1', :barbican_api_version => 'v1',
:barbican_auth_endpoint => 'http://127.0.0.1:5000/v3', :barbican_auth_endpoint => 'http://127.0.0.1:5000/v3',
:max_concurrent_live_migrations => '4', :max_concurrent_live_migrations => '4',
:consecutive_build_service_disable_threshold => '9',
} }
end end
@@ -128,6 +130,8 @@ describe 'nova::compute' do
it { is_expected.to contain_nova_config('DEFAULT/max_concurrent_live_migrations').with_value('4') } it { is_expected.to contain_nova_config('DEFAULT/max_concurrent_live_migrations').with_value('4') }
it { is_expected.to contain_nova_config('compute/consecutive_build_service_disable_threshold').with_value('9') }
it { is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with_value(true) } it { is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with_value(true) }
it 'configures nova config_drive_format to vfat' do it 'configures nova config_drive_format to vfat' do