From b0700d3edd59c9a320af50ce93aa6e83b8b4daf4 Mon Sep 17 00:00:00 2001
From: Francesco Pantano <fpantano@redhat.com>
Date: Mon, 9 Nov 2020 17:25:17 +0100
Subject: [PATCH] Add ceph_client tag to execute or skip the playbook

There are some use cases where there's a need to skip the execution
of the ceph-ansible client role even though the client section of the
inventory isn't empty.
This can happen in contexts where the services are colocated or when
a all-in-one deployment is performed.
The purpose of this change is adding a 'ceph_client' tag to avoid
altering the ceph-ansible execution flow but at the same time be able
to include or exclude a set of tasks using this tag.

Signed-off-by: Francesco Pantano <fpantano@redhat.com>
(cherry picked from commit fafd5f871a81f5e8cdba6e531e499a9678b2dcad)
---
 site-container.yml.sample | 9 +++++----
 site.yml.sample           | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/site-container.yml.sample b/site-container.yml.sample
index 89c9a953c..bf824bdd9 100644
--- a/site-container.yml.sample
+++ b/site-container.yml.sample
@@ -283,18 +283,19 @@
 
     - import_role:
         name: ceph-defaults
-      tags: ['ceph_update_config']
+      tags: ['ceph_update_config', 'ceph_client']
     - import_role:
         name: ceph-facts
-      tags: ['ceph_update_config']
+      tags: ['ceph_update_config', 'ceph_client']
     - import_role:
         name: ceph-handler
-      tags: ['ceph_update_config']
+      tags: ['ceph_update_config', 'ceph_client']
     - import_role:
         name: ceph-config
-      tags: ['ceph_update_config']
+      tags: ['ceph_update_config', 'ceph_client']
     - import_role:
         name: ceph-client
+      tags: ['ceph_client']
 
     # post-tasks for preceding imports -
     - name: set ceph client install 'Complete'
diff --git a/site.yml.sample b/site.yml.sample
index 947586196..ea7e720de 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -272,18 +272,19 @@
   tasks:
     - import_role:
         name: ceph-defaults
-      tags: ['ceph_update_config']
+      tags: ['ceph_update_config', 'ceph_client']
     - import_role:
         name: ceph-facts
-      tags: ['ceph_update_config']
+      tags: ['ceph_update_config', 'ceph_client']
     - import_role:
         name: ceph-handler
-      tags: ['ceph_update_config']
+      tags: ['ceph_update_config', 'ceph_client']
     - import_role:
         name: ceph-config
-      tags: ['ceph_update_config']
+      tags: ['ceph_update_config', 'ceph_client']
     - import_role:
         name: ceph-client
+      tags: ['ceph_client']
 
   post_tasks:
     - name: set ceph client install 'Complete'