]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
dashboard: remove useless block section
authorDimitri Savineau <dsavinea@redhat.com>
Wed, 2 Oct 2019 18:58:42 +0000 (14:58 -0400)
committerGuillaume Abrioux <gabrioux@redhat.com>
Fri, 4 Oct 2019 11:28:37 +0000 (13:28 +0200)
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

index 1ad10a856a8dd3678774073847ece34b42455f5a..023d1df056ccdf14d20c829d32e88d546ce66a93 100644 (file)
             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'
             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'
             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'