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>

diff --git a/site-container.yml.sample b/site-container.yml.sample
index fde8922eb537304bdca4b64726d16cd15f5d7601..fe1bb775b59d5d2e97ce9cc698b86fa70b37b789 100644 (file)
--- a/site-container.yml.sample
+++ b/site-container.yml.sample
@@ -282,18 +282,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 0c65034a27a4e7949cac70f73af43d522207c341..dcb6202057de8e0fb0f3a2d4d7c3710a4d84103f 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -271,18 +271,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'