openstack/puppet-nova
Code Issues Proposed changes

Remove support for [scheduler] query_placement_for_availability_zone

Browse Source 
... because the parameter was removed from nova.

Depends-on: https://review.opendev.org/c/openstack/nova/+/886779
Change-Id: I4c4a340741bd28247fc7e0a1ba831ad9108fa304
This commit is contained in:
Takashi Kajinami 2023-09-08 10:56:00 +09:00
parent a5b68f7319
commit 13e0df8130
3 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/scheduler.pp
View File

@ -66,15 +66,6 @@
# compute hosts affined to routed network segment aggregates.
# Defaults to $facts['os_service_default']
#
# DEPRECATED PARAMETERS
#
# [*query_placement_for_availability_zone*]
# (Optional) This setting allows the scheduler to look up a host aggregate
# with metadata key of availability zone set to the value provided by
# incoming request, and request result from placement be limited to that
# aggregate.
# Defaults to undef
#
class nova::scheduler(
Boolean $enabled = true,
Boolean $manage_service = true,
@ -88,8 +79,6 @@ class nova::scheduler(
$max_placement_results = $facts['os_service_default'],
$enable_isolated_aggregate_filtering = $facts['os_service_default'],
$query_placement_for_routed_network_aggregates = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$query_placement_for_availability_zone = undef,
) {
include nova::deps
@ -97,11 +86,6 @@ class nova::scheduler(
include nova::params
include nova::availability_zone
if $query_placement_for_availability_zone != undef {
warning('The query_placement_for_availability_zone parameter is deprecated.')
}
$query_placement_for_availability_zone_real = pick($query_placement_for_availability_zone, $facts['os_service_default'])
nova::generic_service { 'scheduler':
enabled => $enabled,
manage_service => $manage_service,
@ -119,7 +103,6 @@ class nova::scheduler(
'scheduler/placement_aggregate_required_for_tenants': value => $placement_aggregate_required_for_tenants;
'scheduler/max_placement_results': value => $max_placement_results;
'scheduler/enable_isolated_aggregate_filtering': value => $enable_isolated_aggregate_filtering;
'scheduler/query_placement_for_availability_zone': value => $query_placement_for_availability_zone_real;
'scheduler/query_placement_for_routed_network_aggregates': value => $query_placement_for_routed_network_aggregates;
}
}

5
releasenotes/notes/remove-query_placement_for_availability_zone-2362e261378d8a1d.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``nova::scheduler::query_placement_for_availability_zone`` parameter
has been removed.

9
spec/classes/nova_scheduler_spec.rb
View File

@ -25,7 +25,6 @@ describe 'nova::scheduler' do
it { is_expected.to contain_nova_config('scheduler/placement_aggregate_required_for_tenants').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('scheduler/max_placement_results').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('scheduler/enable_isolated_aggregate_filtering').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('scheduler/query_placement_for_availability_zone').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('scheduler/query_placement_for_routed_network_aggregates').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_class('nova::availability_zone') }
@ -113,14 +112,6 @@ describe 'nova::scheduler' do
it { is_expected.to contain_nova_config('scheduler/enable_isolated_aggregate_filtering').with_value(true) }
end
context 'with query_placement_for_availability_zone' do
let :params do
{ :query_placement_for_availability_zone => true }
end
it { is_expected.to contain_nova_config('scheduler/query_placement_for_availability_zone').with_value(true) }
end
context 'with query_placement_for_routed_network_aggregates' do
let :params do
{ :query_placement_for_routed_network_aggregates => true }