Move role dependencies in site.yml/site-docker.yml

This will give us more flexibility and avoid a lot of useless when
skipping all tasks from a non-desired role.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index ddb5c37cebbfe9d7724d4ab2ea628c6444cb64ab..5c0919732b1747865b1e1d3aed79fbaf5f675de9 100644 (file)
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -93,8 +93,8 @@
 
   roles:
     - ceph-defaults
-    - { role: ceph.ceph-common, when: not containerized_deployment }
-    - { role: ceph.ceph-docker-common, when: containerized_deployment }
+    - { role: ceph-common, when: not containerized_deployment }
+    - { role: ceph-docker-common, when: containerized_deployment }
     - ceph-mon
 
   post_tasks:
@@ -229,8 +229,8 @@
 
   roles:
     - ceph-defaults
-    - { role: ceph.ceph-common, when: not containerized_deployment }
-    - { role: ceph.ceph-docker-common, when: containerized_deployment }
+    - { role: ceph-common, when: not containerized_deployment }
+    - { role: ceph-docker-common, when: containerized_deployment }
     - ceph-osd
 
   post_tasks:
@@ -349,8 +349,8 @@
 
   roles:
     - ceph-defaults
-    - { role: ceph.ceph-common, when: not containerized_deployment }
-    - { role: ceph.ceph-docker-common, when: containerized_deployment }
+    - { role: ceph-common, when: not containerized_deployment }
+    - { role: ceph-docker-common, when: containerized_deployment }
     - ceph-mds
 
   post_tasks:
@@ -422,8 +422,8 @@
 
   roles:
     - ceph-defaults
-    - { role: ceph.ceph-common, when: not containerized_deployment }
-    - { role: ceph.ceph-docker-common, when: containerized_deployment }
+    - { role: ceph-common, when: not containerized_deployment }
+    - { role: ceph-docker-common, when: containerized_deployment }
     - ceph-rgw
 
   post_tasks:
@@ -471,5 +471,5 @@
 
   roles:
     - ceph-defaults
-    - ceph.ceph-common
+    - ceph-common
     - ceph-client

diff --git a/roles/ceph-client/meta/main.yml b/roles/ceph-client/meta/main.yml
index f0a366a395e30e21b9ba0bb011b74b6f51f659f8..98d8c91d79e2768a8728143c5c278f4261f7fa39 100644 (file)
--- a/roles/ceph-client/meta/main.yml
+++ b/roles/ceph-client/meta/main.yml
@@ -10,5 +10,4 @@ galaxy_info:
         - trusty
   categories:
     - system
-dependencies:
-  - { role: ceph.ceph-common }
+dependencies: []

diff --git a/roles/ceph-mds/meta/main.yml b/roles/ceph-mds/meta/main.yml
index 9b7943261b7989f45023cbdb2e9345ef64693ef6..7f5d25ce62cd73be0b9ed2b282e452355fd7245e 100644 (file)
--- a/roles/ceph-mds/meta/main.yml
+++ b/roles/ceph-mds/meta/main.yml
@@ -10,6 +10,4 @@ galaxy_info:
         - trusty
   categories:
     - system
-dependencies:
-  - { role: ceph.ceph-common, when: not containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: containerized_deployment }
+dependencies: []

diff --git a/roles/ceph-mgr/meta/main.yml b/roles/ceph-mgr/meta/main.yml
index 6829b9ebc8535a2463fc556b68fdcd3da8a794d5..ffe7e82996c6c3fd3663d2b60732288f7c12a71f 100644 (file)
--- a/roles/ceph-mgr/meta/main.yml
+++ b/roles/ceph-mgr/meta/main.yml
@@ -13,6 +13,4 @@ galaxy_info:
         - 7
   categories:
     - system
-dependencies:
-  - { role: ceph.ceph-common, when: not containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: containerized_deployment }
+dependencies: []

diff --git a/roles/ceph-mon/meta/main.yml b/roles/ceph-mon/meta/main.yml
index 0d99a1b3b931ffb8a9d56536ea1ca2e93103d130..797a14dafb84a161c75e3147918dda7f0ad7f33a 100644 (file)
--- a/roles/ceph-mon/meta/main.yml
+++ b/roles/ceph-mon/meta/main.yml
@@ -10,6 +10,4 @@ galaxy_info:
         - trusty
   categories:
     - system
-dependencies:
-  - { role: ceph.ceph-common, when: not containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: containerized_deployment }
+dependencies: []

diff --git a/roles/ceph-nfs/meta/main.yml b/roles/ceph-nfs/meta/main.yml
index 9b30523883194b39690a3f873219987eb2df57ea..5c3d8a6111e1e1aa0186a129f17e28adbae68d4c 100644 (file)
--- a/roles/ceph-nfs/meta/main.yml
+++ b/roles/ceph-nfs/meta/main.yml
@@ -10,6 +10,4 @@ galaxy_info:
         - trusty
   categories:
     - system
-dependencies:
-  - { role: ceph.ceph-common, when: not containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: containerized_deployment }
+dependencies: []

diff --git a/roles/ceph-osd/meta/main.yml b/roles/ceph-osd/meta/main.yml
index ef9c436af79995cd4ac76128f04f257dafc24963..afa08ec9eb175cbc4c43c214d6d5888c9d052f23 100644 (file)
--- a/roles/ceph-osd/meta/main.yml
+++ b/roles/ceph-osd/meta/main.yml
@@ -10,6 +10,4 @@ galaxy_info:
         - trusty
   categories:
     - system
-dependencies:
-  - { role: ceph.ceph-common, when: not containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: containerized_deployment }
+dependencies: []

diff --git a/roles/ceph-rbd-mirror/meta/main.yml b/roles/ceph-rbd-mirror/meta/main.yml
index a73a1447c29b252038a30adf80d086ed2e77d225..4a0799943cfdde368078685d48b92e2ba77737c3 100644 (file)
--- a/roles/ceph-rbd-mirror/meta/main.yml
+++ b/roles/ceph-rbd-mirror/meta/main.yml
@@ -13,6 +13,4 @@ galaxy_info:
         - 7
   categories:
     - system
-dependencies:
-  - { role: ceph.ceph-common, when: not containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: containerized_deployment }
+dependencies: []

diff --git a/roles/ceph-restapi/meta/main.yml b/roles/ceph-restapi/meta/main.yml
index 809d979c2bdfa0d8df62bbe3308dccb97858c09b..fb4a0bc7881d2db6d6c5a38f0efdc4cbb6e4191f 100644 (file)
--- a/roles/ceph-restapi/meta/main.yml
+++ b/roles/ceph-restapi/meta/main.yml
@@ -10,6 +10,4 @@ galaxy_info:
         - trusty
   categories:
     - system
-dependencies:
-  - { role: ceph.ceph-common, when: not containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: containerized_deployment }
+dependencies: []

diff --git a/roles/ceph-rgw/meta/main.yml b/roles/ceph-rgw/meta/main.yml
index cffb6d934dab14ab2e6030278ace104dfdf2a8f3..745a72174fef319a1f3f15304326866e6e86342e 100644 (file)
--- a/roles/ceph-rgw/meta/main.yml
+++ b/roles/ceph-rgw/meta/main.yml
@@ -10,6 +10,4 @@ galaxy_info:
         - trusty
   categories:
     - system
-dependencies:
-  - { role: ceph.ceph-common, when: not containerized_deployment }
-  - { role: ceph.ceph-docker-common, when: containerized_deployment }
+dependencies: []

diff --git a/site-docker.yml.sample b/site-docker.yml.sample
index 8bafee7cda8b77d56473ff288952e867b067b859..5740c399f8065098a388e89e33ef26c2ab86789e 100644 (file)
--- a/site-docker.yml.sample
+++ b/site-docker.yml.sample
@@ -19,45 +19,63 @@
   become: True
   gather_facts: false
   roles:
-  - ceph-mon
+    - ceph-defaults
+    - ceph-docker-common
+    - ceph-mon
   serial: 1 # MUST be '1' WHEN DEPLOYING MONITORS ON DOCKER CONTAINERS
 
 - hosts: osds
   become: True
   roles:
-  - ceph-osd
+    - ceph-defaults
+    - ceph-docker-common
+    - ceph-osd
 
 - hosts: mdss
   become: True
   roles:
-  - ceph-mds
+    - ceph-defaults
+    - ceph-docker-common
+    - ceph-mds
 
 - hosts: rgws
   become: True
   roles:
-  - ceph-rgw
+    - ceph-defaults
+    - ceph-docker-common
+    - ceph-rgw
 
 - hosts: nfss
   become: True
   roles:
-  - ceph-nfs
+    - ceph-defaults
+    - ceph-docker-common
+    - ceph-nfs
 
 - hosts: rbd_mirrors
   become: True
   roles:
-  - ceph-rbd-mirror
+    - ceph-defaults
+    - ceph-docker-common
+    - ceph-rbd-mirror
 
 - hosts: restapis
   become: True
   roles:
-  - ceph-restapi
+    - ceph-defaults
+    - ceph-docker-common
+    - ceph-restapi
 
 - hosts: mgrs
   become: True
   roles:
+    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - { role: ceph-docker-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
     - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
 
 - hosts: clients
   become: True
   roles:
+  - ceph-defaults
+  - ceph-common
   - ceph-client

diff --git a/site.yml.sample b/site.yml.sample
index 16fd1b82140c3ac808907f8e3ca1eee5f4e64fcc..34b9234270ee561be61c75031a70b3fd242dd461 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -42,58 +42,78 @@
   gather_facts: false
   become: True
   roles:
-  - ceph-mon
+    - ceph-defaults
+    - ceph-common
+    - ceph-mon
 
 - hosts: agents
   gather_facts: false
   become: True
   roles:
-  - ceph-agent
+    - ceph-defaults
+    - ceph-common
+    - ceph-agent
 
 - hosts: osds
   gather_facts: false
   become: True
   roles:
-  - ceph-osd
+    - ceph-defaults
+    - ceph-common
+    - ceph-osd
 
 - hosts: mdss
   gather_facts: false
   become: True
   roles:
-  - ceph-mds
+    - ceph-defaults
+    - ceph-common
+    - ceph-mds
 
 - hosts: rgws
   gather_facts: false
   become: True
   roles:
-  - ceph-rgw
+    - ceph-defaults
+    - ceph-common
+    - ceph-rgw
 
 - hosts: nfss
   gather_facts: false
   become: True
   roles:
-  - ceph-nfs
+    - ceph-defaults
+    - ceph-common
+    - ceph-nfs
 
 - hosts: restapis
   gather_facts: false
   become: True
   roles:
-  - ceph-restapi
+    - ceph-defaults
+    - ceph-common
+    - ceph-restapi
 
 - hosts: rbdmirrors
   gather_facts: false
   become: True
   roles:
-  - ceph-rbd-mirror
+    - ceph-defaults
+    - ceph-common
+    - ceph-rbd-mirror
 
 - hosts: clients
   gather_facts: false
   become: True
   roles:
-  - ceph-client
+    - ceph-defaults
+    - ceph-common
+    - ceph-client
 
 - hosts: mgrs
   gather_facts: false
   become: True
   roles:
+    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - { role: ceph-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
     - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }