From 3b50632743d6f66ee0a4dd43a8d4a26da13e81f9 Mon Sep 17 00:00:00 2001
From: John Fulton <fulton@redhat.com>
Date: Tue, 14 Jan 2020 08:53:18 -0500
Subject: [PATCH] Add pre/post ceph validation groups

Change-Id: Iec3fddffade4ecd02d2e59ebd2769b421d8577ac
(cherry picked from commit f9249dc0475af2f8cd06efe5025d75220c3f35ea)
---
 groups.yaml                                | 8 ++++++++
 playbooks/ceph-ansible-installed.yaml      | 1 +
 playbooks/ceph-dependencies-installed.yaml | 1 +
 playbooks/ceph-health.yaml                 | 1 +
 playbooks/ceph-pg.yaml                     | 1 +
 5 files changed, 12 insertions(+)

diff --git a/groups.yaml b/groups.yaml
index c04bf79e9..088a7d0b8 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -32,3 +32,11 @@ post-upgrade:
   - description: >-
       Validations which try to validate your OpenStack deployment after you
       upgrade it.
+pre-ceph:
+  - description: >-
+      Validations to run on undercloud before deploying OpenStack
+      with Ceph.
+post-ceph:
+  - description: >-
+      Validations to run on overcloud after deploying OpenStack
+      with Ceph.
diff --git a/playbooks/ceph-ansible-installed.yaml b/playbooks/ceph-ansible-installed.yaml
index 5cdd66c18..a3d4620d4 100644
--- a/playbooks/ceph-ansible-installed.yaml
+++ b/playbooks/ceph-ansible-installed.yaml
@@ -7,6 +7,7 @@
         Prints a message if ceph-ansible isn't installed
       groups:
         - pre-deployment
+        - pre-ceph
     fail_without_ceph_ansible: false
     ceph_ansible_repo: "centos-ceph-nautilus"
   tasks:
diff --git a/playbooks/ceph-dependencies-installed.yaml b/playbooks/ceph-dependencies-installed.yaml
index ecfdbc9e9..4fa880bf1 100644
--- a/playbooks/ceph-dependencies-installed.yaml
+++ b/playbooks/ceph-dependencies-installed.yaml
@@ -7,6 +7,7 @@
         Prints a message if a ceph dependency is missed
       groups:
         - pre-deployment
+        - pre-ceph
     fail_without_deps: true
     tripleo_delegate_to: "{{ groups['overcloud'] | default([]) }}"
     packages:
diff --git a/playbooks/ceph-health.yaml b/playbooks/ceph-health.yaml
index e9e486402..d25df0d4f 100644
--- a/playbooks/ceph-health.yaml
+++ b/playbooks/ceph-health.yaml
@@ -9,6 +9,7 @@
 
       groups:
         - post-deployment
+        - post-ceph
     osd_percentage_min: 0
   tasks:
     - include_role:
diff --git a/playbooks/ceph-pg.yaml b/playbooks/ceph-pg.yaml
index 6d5ae0f8e..5c51cafc3 100644
--- a/playbooks/ceph-pg.yaml
+++ b/playbooks/ceph-pg.yaml
@@ -16,6 +16,7 @@
         the deployment will fail.
       groups:
         - pre-deployment
+        - post-ceph
   tasks:
     - include_role:
         name: ceph