dashboard: do not call ceph-container-common from other role

use site.yml to deploy ceph-container-common in order to install docker
even in non-containerized deployments since there's no RPM available to
deploy the differents applications needed for ceph-dashboard.

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

diff --git a/roles/ceph-grafana/tasks/setup_container.yml b/roles/ceph-grafana/tasks/setup_container.yml
index 7889d71947f99b4ff9d99b0c5114eb76a026a0c9..6c9c9f8f7516b85654007830fa61b214651e9110 100644 (file)
--- a/roles/ceph-grafana/tasks/setup_container.yml
+++ b/roles/ceph-grafana/tasks/setup_container.yml
@@ -1,9 +1,4 @@
 ---
-- name: include ceph-container-common
-  include_role:
-    name: ceph-container-common
-    allow_duplicates: false
-
 - name: create grafana user
   user:
     name: grafana

diff --git a/roles/ceph-node-exporter/tasks/setup_container.yml b/roles/ceph-node-exporter/tasks/setup_container.yml
index 6a557f23c899701b94292f105fea31647cea433e..473c6cf4f89b889f46fa876ccb51e516a16f7aff 100644 (file)
--- a/roles/ceph-node-exporter/tasks/setup_container.yml
+++ b/roles/ceph-node-exporter/tasks/setup_container.yml
@@ -1,9 +1,4 @@
 ---
-- name: include ceph-container-common
-  include_role:
-    name: ceph-container-common
-    allow_duplicates: false
-
 - name: make sure the node_exporter service is down
   service:
     name: node_exporter

diff --git a/roles/ceph-prometheus/tasks/setup_container.yml b/roles/ceph-prometheus/tasks/setup_container.yml
index b78134cf354fbf2fa2e8ee68fbded797ef1d72ff..057185a28a1394a6ec67e3b129bcf71cc600f4ff 100644 (file)
--- a/roles/ceph-prometheus/tasks/setup_container.yml
+++ b/roles/ceph-prometheus/tasks/setup_container.yml
@@ -1,9 +1,4 @@
 ---
-- name: include ceph-container-common
-  include_role:
-    name: ceph-container-common
-    allow_duplicates: false
-
 - name: make sure the alertmanager service is down
   service:
     name: alertmanager

diff --git a/site.yml.sample b/site.yml.sample
index 23250a79a3609ef2a1e9eb43f8da0b591c9813c1..dc717b1f4905e944e8c6d2681ca01c980d0abd64 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -93,9 +93,6 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-    - import_role:
-        name: ceph-node-exporter
-      when: dashboard_enabled
     - import_role:
         name: ceph-common
     - import_role:
@@ -138,9 +135,6 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-    - import_role:
-        name: ceph-node-exporter
-      when: dashboard_enabled
     - import_role:
         name: ceph-common
     - import_role:
@@ -180,9 +174,6 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-    - import_role:
-        name: ceph-node-exporter
-      when: dashboard_enabled
     - import_role:
         name: ceph-common
     - import_role:
@@ -222,9 +213,6 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-    - import_role:
-        name: ceph-node-exporter
-      when: dashboard_enabled
     - import_role:
         name: ceph-common
     - import_role:
@@ -264,9 +252,6 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-    - import_role:
-        name: ceph-node-exporter
-      when: dashboard_enabled
     - import_role:
         name: ceph-common
     - import_role:
@@ -306,9 +291,6 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-    - import_role:
-        name: ceph-node-exporter
-      when: dashboard_enabled
     - import_role:
         name: ceph-common
     - import_role:
@@ -348,9 +330,6 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-    - import_role:
-        name: ceph-node-exporter
-      when: dashboard_enabled
     - import_role:
         name: ceph-common
     - import_role:
@@ -390,9 +369,6 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-    - import_role:
-        name: ceph-node-exporter
-      when: dashboard_enabled
     - import_role:
         name: ceph-common
     - import_role:
@@ -432,9 +408,6 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-    - import_role:
-        name: ceph-node-exporter
-      when: dashboard_enabled
     - import_role:
         name: ceph-common
     - import_role:
@@ -476,9 +449,6 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-handler
-    - import_role:
-        name: ceph-node-exporter
-      when: dashboard_enabled
     - import_role:
         name: ceph-common
     - import_role:
@@ -517,6 +487,23 @@
       run_once: true
       when: not ceph_status.failed
 
+- hosts: all
+  become: true
+  tasks:
+    - block:
+        - import_role:
+            name: ceph-defaults
+        - import_role:
+            name: ceph-facts
+        - import_role:
+            name: ceph-handler
+        - import_role:
+            name: ceph-container-common
+        - import_role:
+            name: ceph-node-exporter
+      when: dashboard_enabled
+
+
 - hosts: grafana-server
   become: true
   tasks:
@@ -531,9 +518,6 @@
     - import_role:
         name: ceph-handler
       when: dashboard_enabled
-    - import_role:
-        name: ceph-node-exporter
-      when: dashboard_enabled
     - import_role:
         name: ceph-common
       when: dashboard_enabled