From 79de7e852afd0ad9397fe8e042be81e5b1f71ec5 Mon Sep 17 00:00:00 2001
From: John Fulton <fulton@redhat.com>
Date: Wed, 21 Oct 2020 12:25:24 +0000
Subject: [PATCH] Remove ceph-pg from openstack tripleo validator run groups

By design this validation will never suceed when run by openstack
tripleo validator run and thus it should be removed from the groups
that would cause it to be run this way.

Change-Id: I4ad2c6efe18a2cc63c6fa5189d420d7a2be1f753
Closes-Bug: #1900713
(cherry picked from commit 94b0d3c4a36eada16be4f0c2b079c7968cd9cc9c)
---
 .ansible-lint          |  3 ++-
 playbooks/ceph-pg.yaml | 26 ++++++++++++--------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.ansible-lint b/.ansible-lint
index a8796493c..b4f6df516 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -1,5 +1,6 @@
 exclude_paths:
     - releasenotes/
+    - playbooks/ceph-pg.yaml
 parseable: true
 quiet: false
 rulesdir:
@@ -22,4 +23,4 @@ skip_list:
     - '702'
     # meta/main.yml default values should be changed
     - '703'
-verbosity: 1
\ No newline at end of file
+verbosity: 1
diff --git a/playbooks/ceph-pg.yaml b/playbooks/ceph-pg.yaml
index 5c51cafc3..ad4916a39 100644
--- a/playbooks/ceph-pg.yaml
+++ b/playbooks/ceph-pg.yaml
@@ -3,20 +3,18 @@
   vars:
     metadata:
       name: Validate requested Ceph Placement Groups
-      description: >
-        In Ceph Lumionus and newer the Placement Group overdose protection
-        check (https://ceph.com/community/new-luminous-pg-overdose-protection)
-        is executed by Ceph before a pool is created. If the check does not
-        pass, then the pool is not created. When TripleO deploys Ceph it
-        triggers ceph-ansible which creates the pools that OpenStack needs.
-        This validation runs the same check that the overdose protection uses
-        to determine if the user should update their CephPools, PG count, or
-        number of OSD. Without this check a deployer may have to wait until
-        after Ceph is running but before the pools are created to realize
-        the deployment will fail.
-      groups:
-        - pre-deployment
-        - post-ceph
+      description: |
+        In Ceph Lumionus and newer the Placement Group overdose protection check
+        (https://ceph.com/community/new-luminous-pg-overdose-protection) is
+        executed by Ceph before a pool is created. If the check does not pass,
+        then the pool is not created. When TripleO deploys Ceph it triggers
+        ceph-ansible which creates the pools that OpenStack needs.  This
+        validation runs the same check that the overdose protection uses to
+        determine if the user should update their CephPools, PG count, or number
+        of OSD. Without this check a deployer may have to wait until after Ceph
+        is running but before the pools are created to realize the deployment
+        will fail.
+      groups: []
   tasks:
     - include_role:
         name: ceph