openstack
/
puppet-nova
Code Issues Proposed changes

Deprecate query_placement_for_availability_zone 

... because the parameter was already deprecated in nova[1].

[1] 7c7a2a142d74a7deeda2a79baf21b689fe32cd08

Change-Id: I817f9cff13f164e6a54f4ef5eebe8d2be8dd2b8e
This commit is contained in:
Takashi Kajinami 2021-09-24 22:06:05 +09:00
parent 18c67bab90
commit 7a2a857975
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
manifests/scheduler.pp
View File

@ -61,13 +61,6 @@
# flavor/image.
# Defaults to $::os_service_default
#
# [*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 $::os_service_default
#
# [*query_placement_for_routed_network_aggregates*]
# (Optional) This setting allows to enable the scheduler to filter
# compute hosts affined to routed network segment aggregates.
@ -81,6 +74,13 @@
# determined by the particular scheduler being used.
# Defaults to undef
#
# [*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(
$enabled = true,
$manage_service = true,
@ -93,10 +93,10 @@ class nova::scheduler(
$placement_aggregate_required_for_tenants = $::os_service_default,
$max_placement_results = $::os_service_default,
$enable_isolated_aggregate_filtering = $::os_service_default,
$query_placement_for_availability_zone = $::os_service_default,
$query_placement_for_routed_network_aggregates = $::os_service_default,
# DEPRECATED PARAMETERS
$periodic_task_interval = undef,
$query_placement_for_availability_zone = undef,
) {
include nova::deps
@ -108,6 +108,11 @@ class nova::scheduler(
warning('The periodic_task_interval parameter is depreated and has no effect')
}
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, $::os_service_default)
nova::generic_service { 'scheduler':
enabled => $enabled,
manage_service => $manage_service,
@ -125,7 +130,7 @@ 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;
'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/deprecate-query_placement_for_availability_zone-ce9c55a316a37ec6.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``nova::scheduler::query_placement_for_availability_zone`` parameter
has been deprecated and will be removed in a future release.