From 88b7347fd697a1daef5cd1167e55fafb0aa53705 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Tue, 9 Oct 2018 11:00:51 -0600
Subject: [PATCH] Add nova-scheduler worker support

Rocky added nova-scheduler worker support so we need to be able to
configure (and tune it) as necessary.

Change-Id: Idd702e01b67a2f25eb621d1251e8457ea376f51b
Closes-Bug: #1796933
---
 puppet/services/nova-scheduler.yaml                 | 13 +++++++++++++
 ...a-scheduler-worker-support-0ab66160b936a0c0.yaml |  4 ++++
 2 files changed, 17 insertions(+)
 create mode 100644 releasenotes/notes/add-nova-scheduler-worker-support-0ab66160b936a0c0.yaml

diff --git a/puppet/services/nova-scheduler.yaml b/puppet/services/nova-scheduler.yaml
index 4148f837b3..877dac2357 100644
--- a/puppet/services/nova-scheduler.yaml
+++ b/puppet/services/nova-scheduler.yaml
@@ -65,6 +65,13 @@ parameters:
       attempt to discover new hosts that have been added to cells.
       The default value of -1 disables the periodic task completely.
       It is recommended to set this parameter for deployments using Ironic.
+  NovaSchedulerWorkers:
+    default: 0
+    description: Number of workers for Nova Scheduler services.
+    type: number
+
+conditions:
+  nova_scheduler_workers_zero: {equals : [{get_param: NovaSchedulerWorkers}, 0]}
 
 resources:
   NovaBase:
@@ -91,6 +98,12 @@ 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}
+          -
+            if:
+            - nova_scheduler_workers_zero
+            - {}
+            - nova::scheduler::workers: {get_param: NovaSchedulerWorkers}
+
       service_config_settings:
         fluentd:
           tripleo_fluentd_groups_nova_scheduler:
diff --git a/releasenotes/notes/add-nova-scheduler-worker-support-0ab66160b936a0c0.yaml b/releasenotes/notes/add-nova-scheduler-worker-support-0ab66160b936a0c0.yaml
new file mode 100644
index 0000000000..c0729cbdc1
--- /dev/null
+++ b/releasenotes/notes/add-nova-scheduler-worker-support-0ab66160b936a0c0.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - Nova Scheduler added worker support in Rocky. Added `NovaSchedulerWorkers`
+    to allow it to be configurable.