diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml
index dd9deaa7f5..6ecbc6539e 100644
--- a/deployment/nova/nova-scheduler-container-puppet.yaml
+++ b/deployment/nova/nova-scheduler-container-puppet.yaml
@@ -91,6 +91,14 @@ parameters:
       If aggregates are used to limit some tenants but not all, then this should be
       False. If all tenants should be confined via aggregate, then this should be True.
     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:
   nova_scheduler_workers_zero: {equals : [{get_param: NovaSchedulerWorkers}, 0]}
@@ -136,6 +144,7 @@ outputs:
             nova::scheduler::discover_hosts_in_cells_interval: {get_param: NovaSchedulerDiscoverHostsInCellsInterval}
             nova::scheduler::limit_tenants_to_placement_aggregate: {get_param: NovaSchedulerLimitTenantsToPlacementAggregate}
             nova::scheduler::placement_aggregate_required_for_tenants: {get_param: NovaSchedulerPlacementAggregateRequiredForTenants}
+            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.