Execute common roles once on all nodes

The common roles don't need to be executed again on each group plays
(like mons, osds, etc..).
We only need to execute them during the first play. That wat, we will
apply the changes on all nodes in parallel instead of doing it once per
group.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/infrastructure-playbooks/dashboard.yml b/infrastructure-playbooks/dashboard.yml
index 679fad1bffde1968420c0fa9522ad4f81b3d15c2..979ed49277f6ab09ef4b029d7732cb6215830ba5 100644 (file)
--- a/infrastructure-playbooks/dashboard.yml
+++ b/infrastructure-playbooks/dashboard.yml
@@ -51,8 +51,6 @@
     - import_role:
         name: ceph-facts
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
     - import_role:
         name: ceph-prometheus
     - import_role:

diff --git a/site-container.yml.sample b/site-container.yml.sample
index b0cedb61691f3d33775dad9164a57a2aa499ddd2..6c6e4af7e80aeb4e705bd053fdcd2fe1d5eaf460 100644 (file)
--- a/site-container.yml.sample
+++ b/site-container.yml.sample
@@ -83,10 +83,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -130,10 +126,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -172,10 +164,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -214,10 +202,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -256,10 +240,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -298,10 +278,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -340,10 +316,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -382,12 +354,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-      when: inventory_hostname == groups.get('clients', ['']) | first
-    - import_role:
-        name: ceph-container-common
-      when: inventory_hostname == groups.get('clients', ['']) | first
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -428,10 +394,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-container-engine
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']

diff --git a/site.yml.sample b/site.yml.sample
index 2bedfe8fee5b6470c50c08beb6868b87d89c0bee..6c0c1d345bf10cb4d6ebec1457e7e3f3da9c2ed5 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -52,6 +52,8 @@
         name: ceph-validate
     - import_role:
         name: ceph-infra
+    - import_role:
+        name: ceph-common
 
 - hosts: mons
   gather_facts: false
@@ -76,8 +78,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -119,8 +119,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -159,8 +157,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -199,8 +195,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -239,8 +233,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -279,8 +271,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -319,8 +309,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -359,8 +347,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -401,8 +387,6 @@
     - import_role:
         name: ceph-handler
       tags: ['ceph_update_config']
-    - import_role:
-        name: ceph-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']