dashboard: move the call to ceph-node-exporter

This moves the call to ceph-node-exporter role after
ceph-container-common, otherwise it will try to run container before
docker or podman are installed.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 7c6a3bf825cfd94aad98734ec1d00109189d005b)

diff --git a/site-container.yml.sample b/site-container.yml.sample
index 70fbab38cb15ca0ad78c4b705a1f62ccf2fc8eed..a5375e6884b9a465f8f30f06a1f2728ae10e2d46 100644 (file)
--- a/site-container.yml.sample
+++ b/site-container.yml.sample
@@ -114,11 +114,11 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
+    - import_role:
+        name: ceph-container-common
     - import_role:
         name: ceph-node-exporter
       when: dashboard_enabled
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -161,11 +161,11 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
+    - import_role:
+        name: ceph-container-common
     - import_role:
         name: ceph-node-exporter
       when: dashboard_enabled
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -203,11 +203,11 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
+    - import_role:
+        name: ceph-container-common
     - import_role:
         name: ceph-node-exporter
       when: dashboard_enabled
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -245,11 +245,11 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
+    - import_role:
+        name: ceph-container-common
     - import_role:
         name: ceph-node-exporter
       when: dashboard_enabled
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -287,11 +287,11 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
+    - import_role:
+        name: ceph-container-common
     - import_role:
         name: ceph-node-exporter
       when: dashboard_enabled
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -329,11 +329,11 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
+    - import_role:
+        name: ceph-container-common
     - import_role:
         name: ceph-node-exporter
       when: dashboard_enabled
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -371,11 +371,11 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
+    - import_role:
+        name: ceph-container-common
     - import_role:
         name: ceph-node-exporter
       when: dashboard_enabled
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -413,12 +413,12 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-    - import_role:
-        name: ceph-node-exporter
-      when: dashboard_enabled
     - import_role:
         name: ceph-container-common
       when: inventory_hostname == groups.get('clients', ['']) | first
+    - import_role:
+        name: ceph-node-exporter
+      when: dashboard_enabled
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -458,11 +458,11 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
+    - import_role:
+        name: ceph-container-common
     - import_role:
         name: ceph-node-exporter
       when: dashboard_enabled
-    - import_role:
-        name: ceph-container-common
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']
@@ -523,10 +523,10 @@
         tags: ['ceph_update_config']
       - import_role:
           name: ceph-handler
-      - import_role:
-          name: ceph-node-exporter
       - import_role:
           name: ceph-container-common
+      - import_role:
+          name: ceph-node-exporter
       - import_role:
           name: ceph-config
         tags: ['ceph_update_config']