From 603696a065c46d9d4e180ee4119f74bee7ba62a5 Mon Sep 17 00:00:00 2001
From: Rajesh Tailor <ratailor@redhat.com>
Date: Mon, 10 Jun 2019 12:42:29 +0530
Subject: [PATCH] Add new parameter
 NovaSchedulerLimitTenantsToPlacementAggregate

Add new parameter NovaSchedulerLimitTenantsToPlacementAggregate
allows for configuring scheduler to enable tenant-isolation with
placement, which ensures that hosts in tenant-isolated host
aggregate and availability zones will only be available to
specific set of tenants.

 Conflicts:
       deployment/nova/nova-scheduler-container-puppet.yaml

Resolved conflicts occure due to missing change
I6d12a66616cc2cc65e62755e8a54084d65aeae5e in stein.

Depends-On: https://review.opendev.org/#/c/728044/
Change-Id: Ic1a7ff0996c5cfeec2ca013bc4e5b2eddab0c377
(cherry picked from commit 2074b356f57c29f66cf750b86c2b1d8c4e263fe5)
---
 deployment/nova/nova-scheduler-container-puppet.yaml     | 8 ++++++++
 ..._tenants_to_placement_aggregate-9889b0a73dd1d042.yaml | 9 +++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 releasenotes/notes/nova_scheduler_limit_tenants_to_placement_aggregate-9889b0a73dd1d042.yaml

diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml
index 9a2637d3c9..53647c4dd8 100644
--- a/deployment/nova/nova-scheduler-container-puppet.yaml
+++ b/deployment/nova/nova-scheduler-container-puppet.yaml
@@ -75,6 +75,13 @@ parameters:
     default: 0
     description: Number of workers for Nova Scheduler services.
     type: number
+  NovaSchedulerLimitTenantsToPlacementAggregate:
+    default: false
+    description: >
+      This value allows to have tenant isolation with placement. It ensures
+      hosts in tenant-isolated host aggregate and availability zones will
+      only be available to specific set of tenants.
+    type: boolean
 
 conditions:
   nova_scheduler_workers_zero: {equals : [{get_param: NovaSchedulerWorkers}, 0]}
@@ -118,6 +125,7 @@ outputs:
             nova::scheduler::filter::scheduler_default_filters: {get_param: NovaSchedulerDefaultFilters}
             nova::scheduler::filter::scheduler_max_attempts: {get_param: NovaSchedulerMaxAttempts}
             nova::scheduler::discover_hosts_in_cells_interval: {get_param: NovaSchedulerDiscoverHostsInCellsInterval}
+            nova::scheduler::limit_tenants_to_placement_aggregate: {get_param: NovaSchedulerLimitTenantsToPlacementAggregate}
           -
             if:
             - nova_scheduler_workers_zero
diff --git a/releasenotes/notes/nova_scheduler_limit_tenants_to_placement_aggregate-9889b0a73dd1d042.yaml b/releasenotes/notes/nova_scheduler_limit_tenants_to_placement_aggregate-9889b0a73dd1d042.yaml
new file mode 100644
index 0000000000..f09118d976
--- /dev/null
+++ b/releasenotes/notes/nova_scheduler_limit_tenants_to_placement_aggregate-9889b0a73dd1d042.yaml
@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    Add boolean parameter `NovaSchedulerLimitTenantsToPlacementAggregate` which
+    allows to set `scheduler/limit_tenants_to_placement_aggregate` parameter
+    value, to have tenant isolation with placement. It ensures hosts are in
+    tenant-isolated host aggregate and availability zones will only be available
+    to specific set of tenants.
+    Default value for NovaSchedulerLimitTenantsToPlacementAggregate is false.