From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Fri, 11 Sep 2020 08:23:08 +0000 (+0200)
Subject: Revert "Make 'disable ssl for dashboard task' idempotent."
X-Git-Tag: v4.0.32
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=edb7bdd911a0138935e7644fec15b6611ffb7995;p=ceph-ansible.git

Revert "Make 'disable ssl for dashboard task' idempotent."

This reverts commit f607857f2a58b2ed14faf49f2b10d056a7f96b30.

> That commit [1] introduced a regression in the dashboard configuration
> because the ceph config get mgr xxxx command doesn't work with
> nautilus.
> In that release the get operation needs an entity.

> [1] f607857

Signed-off-by: Dimitri Savineau dsavinea@redhat.com
---

diff --git a/roles/ceph-dashboard/tasks/configure_dashboard.yml b/roles/ceph-dashboard/tasks/configure_dashboard.yml
index 026c9c57c..0bc16333a 100644
--- a/roles/ceph-dashboard/tasks/configure_dashboard.yml
+++ b/roles/ceph-dashboard/tasks/configure_dashboard.yml
@@ -5,19 +5,10 @@
   when: containerized_deployment | bool
 
 - name: disable SSL for dashboard
-  when: dashboard_protocol == "http"
+  command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} config set mgr mgr/dashboard/ssl false"
   delegate_to: "{{ groups[mon_group_name][0] }}"
-  block:
-   - name: get SSL status for dashboard
-     run_once: true
-     command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} config get mgr mgr/dashboard/ssl"
-     changed_when: false
-     register: current_ssl_for_dashboard
-
-   - name: disable SSL for dashboard
-     run_once: true
-     command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} config set mgr mgr/dashboard/ssl false"
-     when: current_ssl_for_dashboard.stdout == "true"
+  run_once: true
+  when: dashboard_protocol == "http"
 
 - name: with SSL for dashboard
   when: dashboard_protocol == "https"