From ec1c57f69064ba316ae6db3a48d5c317dcdc2f4c Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dsavinea@redhat.com>
Date: Wed, 2 Oct 2019 14:58:42 -0400
Subject: [PATCH] dashboard: remove useless block section

The block section were used with the dashboard_enabled condition when
the code was included in the main playbooks.
Because this condition isn't present in the dashboard playbook anymore
we can remove the block section.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit cf47594b47a2e50465bcd748ccc3a31df0b8eee4)
---
 infrastructure-playbooks/dashboard.yml | 63 ++++++++++++--------------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/infrastructure-playbooks/dashboard.yml b/infrastructure-playbooks/dashboard.yml
index 1ad10a856..023d1df05 100644
--- a/infrastructure-playbooks/dashboard.yml
+++ b/infrastructure-playbooks/dashboard.yml
@@ -11,17 +11,16 @@
             start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
   tasks:
-    - block:
-        - import_role:
-            name: ceph-defaults
-          tags: ['ceph_update_config']
-        - import_role:
-            name: ceph-facts
-          tags: ['ceph_update_config']
-        - import_role:
-            name: ceph-container-engine
-        - import_role:
-            name: ceph-node-exporter
+    - import_role:
+        name: ceph-defaults
+      tags: ['ceph_update_config']
+    - import_role:
+        name: ceph-facts
+      tags: ['ceph_update_config']
+    - import_role:
+        name: ceph-container-engine
+    - import_role:
+        name: ceph-node-exporter
 
   post_tasks:
     - name: set ceph node exporter install 'Complete'
@@ -44,19 +43,18 @@
             start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
   tasks:
-    - block:
-        - import_role:
-            name: ceph-defaults
-          tags: ['ceph_update_config']
-        - import_role:
-            name: ceph-facts
-          tags: ['ceph_update_config']
-        - import_role:
-            name: ceph-container-engine
-        - import_role:
-            name: ceph-prometheus
-        - import_role:
-            name: ceph-grafana
+    - import_role:
+        name: ceph-defaults
+      tags: ['ceph_update_config']
+    - import_role:
+        name: ceph-facts
+      tags: ['ceph_update_config']
+    - import_role:
+        name: ceph-container-engine
+    - import_role:
+        name: ceph-prometheus
+    - import_role:
+        name: ceph-grafana
 
   post_tasks:
     - name: set ceph grafana install 'Complete'
@@ -79,15 +77,14 @@
             start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
   tasks:
-    - block:
-        - import_role:
-            name: ceph-defaults
-          tags: ['ceph_update_config']
-        - import_role:
-            name: ceph-facts
-          tags: ['ceph_update_config']
-        - import_role:
-            name: ceph-dashboard
+    - import_role:
+        name: ceph-defaults
+      tags: ['ceph_update_config']
+    - import_role:
+        name: ceph-facts
+      tags: ['ceph_update_config']
+    - import_role:
+        name: ceph-dashboard
 
   post_tasks:
     - name: set ceph dashboard install 'Complete'