From a17e13c3128ee7e3dd7298b94554b9dc5392daba Mon Sep 17 00:00:00 2001
From: Sanjay Chari <schari@redhat.com>
Date: Fri, 11 Feb 2022 10:23:32 +0530
Subject: [PATCH] Add Train version to adjustment-nova-scheduler.yml playbook

This patch modifies the adjustment-nova-scheduler.yml playbook
to support the Openstack Train version

Change-Id: Ib1ff0227799ee999043aa915e15dc763ff996324
---
 .../browbeat/adjustment-nova-scheduler.yml    | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/ansible/browbeat/adjustment-nova-scheduler.yml b/ansible/browbeat/adjustment-nova-scheduler.yml
index 5926bfce6..aec530a72 100644
--- a/ansible/browbeat/adjustment-nova-scheduler.yml
+++ b/ansible/browbeat/adjustment-nova-scheduler.yml
@@ -3,7 +3,7 @@
 # Playbook to adjust Nova Scheduler settings to avoid over-scheduling hosts
 # with greater memory in uneven memory environments.
 #
-# Versions tested: Newton, Ocata, Pike
+# Versions tested: Newton, Ocata, Pike, Train
 #
 # Examples:
 # ansible-playbook -i hosts browbeat/adjustment-nova-scheduler.yml -e 'max_instances_per_host=350'
@@ -54,10 +54,20 @@
         nova_config_file: /etc/nova/nova.conf
       when: "('Newton' in osp_version['content'] | b64decode or 'Ocata' in osp_version['content'] | b64decode)"
 
-    - name: (Pike) Set Config File based on OpenStack Version
+    - name: (Pike, Train) Set Config File based on OpenStack Version
       set_fact:
         nova_config_file: /var/lib/config-data/puppet-generated/nova/etc/nova/nova.conf
-      when: "'Pike' in osp_version['content'] | b64decode"
+      when: "('Pike' in osp_version['content'] | b64decode or 'Train' in osp_version['content'] | b64decode)"
+
+    - name: (Pike) Set container cli based on Openstack Version
+      set_fact:
+        container_cli: docker
+      when: "('Pike' in osp_version['content'] | b64decode)"
+
+    - name: (Train) Set container cli based on Openstack Version
+      set_fact:
+        container_cli: podman
+      when: "('Train' in osp_version['content'] | b64decode)"
 
     - name: Set default max_instances_per_host, ram_weight_multiplier, enabled_filters, and host_subset_size
       set_fact:
@@ -130,9 +140,9 @@
         - httpd
       when: "('Newton' in osp_version['content'] | b64decode or 'Ocata' in osp_version['content'] | b64decode) and (restart_nova)"
 
-    - name: (Pike) Restart Nova Scheduler Container
+    - name: (Pike, Train) Restart Nova Scheduler Container
       become: true
-      command: "docker restart {{item}}"
+      command: "{{container_cli}} restart {{item}}"
       with_items:
         - nova_scheduler
-      when: "('Pike' in osp_version['content'] | b64decode) and (restart_nova)"
+      when: "('Pike' in osp_version['content'] | b64decode or 'Train' in osp_version['content'] | b64decode) and (restart_nova)"