From ca830a7f703f2cd140e0836183c15daa1ad5772f Mon Sep 17 00:00:00 2001
From: Daniel Bengtsson <dbengt@redhat.com>
Date: Mon, 15 Mar 2021 11:29:28 +0100
Subject: [PATCH] Add update roles on several validations.

Review existing validations and update groups when it's useful.

Change-Id: I30a0faeb381e290ac5eb1080c1c1cea0ca2ad5b3
(cherry picked from commit 0f1a81dd71af7a533a91d45e737e26fb7e2262c4)
---
 playbooks/container-status.yaml              | 1 +
 playbooks/openstack-endpoints.yaml           | 2 ++
 playbooks/package-version.yaml               | 6 ++++++
 playbooks/repos.yaml                         | 1 +
 playbooks/undercloud-heat-purge-deleted.yaml | 3 ++-
 playbooks/undercloud-service-status.yaml     | 2 ++
 6 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/playbooks/container-status.yaml b/playbooks/container-status.yaml
index 7ae061020..f74d2c05f 100644
--- a/playbooks/container-status.yaml
+++ b/playbooks/container-status.yaml
@@ -7,6 +7,7 @@
         Detect failed containers and raise an error.
       groups:
         - pre-upgrade
+        - pre-update
         - post-deployment
         - post-upgrade
   roles:
diff --git a/playbooks/openstack-endpoints.yaml b/playbooks/openstack-endpoints.yaml
index 148f7cf3b..2874e7aec 100644
--- a/playbooks/openstack-endpoints.yaml
+++ b/playbooks/openstack-endpoints.yaml
@@ -11,5 +11,7 @@
         - post-deployment
         - pre-upgrade
         - post-upgrade
+        - pre-update
+        - post-update
   roles:
     - openstack_endpoints
diff --git a/playbooks/package-version.yaml b/playbooks/package-version.yaml
index a20b68189..74ee5d0fa 100644
--- a/playbooks/package-version.yaml
+++ b/playbooks/package-version.yaml
@@ -11,6 +11,12 @@
         - post-deployment
         - pre-upgrade
         - post-upgrade
+        - pre-update
+        - pre-system-upgrade
+        - pre-undercloud-upgrade
+        - pre-overcloud-prepare
+        - pre-overcloud-upgrade
+        - pre-overcloud-converge
         - pre-ceph
         - post-ceph
     package_version_debug: false
diff --git a/playbooks/repos.yaml b/playbooks/repos.yaml
index ecf34e722..190255508 100644
--- a/playbooks/repos.yaml
+++ b/playbooks/repos.yaml
@@ -12,5 +12,6 @@
         Detect if there are any unwanted repositories (such as EPEL) enabled.
       groups:
         - pre-upgrade
+        - pre-update
   roles:
     - repos
diff --git a/playbooks/undercloud-heat-purge-deleted.yaml b/playbooks/undercloud-heat-purge-deleted.yaml
index dddf7302c..40466a3e9 100644
--- a/playbooks/undercloud-heat-purge-deleted.yaml
+++ b/playbooks/undercloud-heat-purge-deleted.yaml
@@ -5,10 +5,11 @@
       name: Verify heat-manage purge_deleted is enabled in crontab
       description: >
         Without a purge_deleted crontab enabled, the
-        heat database can grow very large.  This validation checks that
+        heat database can grow very large. This validation checks that
         the purge_deleted crontab has been set up.
       groups:
         - pre-upgrade
+        - pre-update
         - pre-deployment
     cron_check: "heat-manage purge_deleted"
   roles:
diff --git a/playbooks/undercloud-service-status.yaml b/playbooks/undercloud-service-status.yaml
index 227dd32a0..45f44c1cf 100644
--- a/playbooks/undercloud-service-status.yaml
+++ b/playbooks/undercloud-service-status.yaml
@@ -8,5 +8,7 @@
       groups:
         - post-upgrade
         - pre-upgrade
+        - post-update
+        - pre-update
   roles:
     - undercloud_service_status