openstack/puppet-nova
Code Issues Proposed changes

Merge "Add parameter for scheduler/query_placement_for_image_type_support"

Browse Source
This commit is contained in:
Zuul
2019-06-11 08:37:55 +00:00
committed by Gerrit Code Review
parent 957f5dfc20 440fe0d318
commit c314d6e184
3 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/scheduler.pp
View File

@@ -29,6 +29,12 @@
# attempt to discover new hosts that have been added to cells. # attempt to discover new hosts that have been added to cells.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*query_placement_for_image_type_support*]
# (optional) This setting causes the scheduler to ask placement only for
# compute hosts that support the ``disk_format`` of the image used in the
# request.
# Defaults to $::os_service_default
#
class nova::scheduler( class nova::scheduler(
$enabled = true, $enabled = true,
$manage_service = true, $manage_service = true,
@@ -36,6 +42,7 @@ class nova::scheduler(
$workers = $::os_workers, $workers = $::os_workers,
$scheduler_driver = 'filter_scheduler', $scheduler_driver = 'filter_scheduler',
$discover_hosts_in_cells_interval = $::os_service_default, $discover_hosts_in_cells_interval = $::os_service_default,
$query_placement_for_image_type_support = $::os_service_default,
) { ) {
include ::nova::deps include ::nova::deps
@@ -55,6 +62,7 @@ class nova::scheduler(
'scheduler/workers': value => $workers; 'scheduler/workers': value => $workers;
'scheduler/driver': value => $scheduler_driver; 'scheduler/driver': value => $scheduler_driver;
'scheduler/discover_hosts_in_cells_interval': value => $discover_hosts_in_cells_interval; 'scheduler/discover_hosts_in_cells_interval': value => $discover_hosts_in_cells_interval;
'scheduler/query_placement_for_image_type_support': value => $query_placement_for_image_type_support;
} }
} }

6
releasenotes/notes/query_placement_for_image_type-351c3200235aa579.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
features:
- |
Add parmeter `query_placement_for_image_type_support` that causes the
scheduler to ask placement only for compute hosts that support the
`disk_format` of the image used in the request.

9
spec/classes/nova_scheduler_spec.rb
View File

@@ -22,6 +22,7 @@ describe 'nova::scheduler' do
it { is_expected.to contain_nova_config('scheduler/workers').with_value(4) } it { is_expected.to contain_nova_config('scheduler/workers').with_value(4) }
it { is_expected.to contain_nova_config('scheduler/driver').with_value('filter_scheduler') } it { is_expected.to contain_nova_config('scheduler/driver').with_value('filter_scheduler') }
it { is_expected.to contain_nova_config('scheduler/discover_hosts_in_cells_interval').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_nova_config('scheduler/discover_hosts_in_cells_interval').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('scheduler/query_placement_for_image_type_support').with_value('<SERVICE DEFAULT>') }
context 'with manage_service as false' do context 'with manage_service as false' do
let :params do let :params do
@@ -66,6 +67,14 @@ describe 'nova::scheduler' do
it { is_expected.to contain_nova_config('scheduler/discover_hosts_in_cells_interval').with_value(15) } it { is_expected.to contain_nova_config('scheduler/discover_hosts_in_cells_interval').with_value(15) }
end end
context 'with query_placement_for_image_type_support' do
let :params do
{ :query_placement_for_image_type_support => true }
end
it { is_expected.to contain_nova_config('scheduler/query_placement_for_image_type_support').with_value(true) }
end
context 'with default database parameters' do context 'with default database parameters' do
let :pre_condition do let :pre_condition do
"include nova" "include nova"