diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml
index ee532ec45f..2c91c99df4 100644
--- a/deployment/nova/nova-scheduler-container-puppet.yaml
+++ b/deployment/nova/nova-scheduler-container-puppet.yaml
@@ -106,6 +106,13 @@ parameters:
       required, the instance flavor extra_specs and/or image metadata must also contain
       trait:$TRAIT_NAME=required to be eligible to be scheduled to hosts in that aggregate.
     type: boolean
+  NovaSchedulerQueryPlacementForAvailabilityZone:
+    default: false
+    description: >
+      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.
+    type: boolean
 
 
 conditions:
@@ -154,6 +161,7 @@ outputs:
             nova::scheduler::limit_tenants_to_placement_aggregate: {get_param: NovaSchedulerLimitTenantsToPlacementAggregate}
             nova::scheduler::placement_aggregate_required_for_tenants: {get_param: NovaSchedulerPlacementAggregateRequiredForTenants}
             nova::scheduler::enable_isolated_aggregate_filtering: {get_param: NovaSchedulerEnableIsolatedAggregateFiltering}
+            nova::scheduler::query_placement_for_availability_zone: {get_param: NovaSchedulerQueryPlacementForAvailabilityZone}
           -
             if:
             - nova_scheduler_workers_zero
diff --git a/releasenotes/notes/nova_scheduler_query_placement_for_availability_zone-ffd415710a9cb903.yaml b/releasenotes/notes/nova_scheduler_query_placement_for_availability_zone-ffd415710a9cb903.yaml
new file mode 100644
index 0000000000..67a464ba83
--- /dev/null
+++ b/releasenotes/notes/nova_scheduler_query_placement_for_availability_zone-ffd415710a9cb903.yaml
@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    Add boolean parameter `NovaSchedulerQueryPlacementForAvailabilityZone`
+    that sets `scheduler/query_placement_for_availability_zone` parameter.
+    It 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.
+    Default value for NovaSchedulerQueryPlacementForAvailabilityZone is false.