From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 15 May 2019 12:35:24 +0000 (+0200)
Subject: dashboard: simplify config-key command
X-Git-Tag: v4.0.0rc8~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c45906e0ac96626cc7776df1dfac0dbf58f07967;p=ceph-ansible.git

dashboard: simplify config-key command

since stable-4.0 isn't to deploy ceph releases prior to nautilus,
there's no need to add this complexity here.

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

diff --git a/roles/ceph-dashboard/tasks/configure_dashboard.yml b/roles/ceph-dashboard/tasks/configure_dashboard.yml
index 24ed1458b..ba7e57049 100644
--- a/roles/ceph-dashboard/tasks/configure_dashboard.yml
+++ b/roles/ceph-dashboard/tasks/configure_dashboard.yml
@@ -5,16 +5,12 @@
   when: containerized_deployment
 
 - name: disable SSL for dashboard
-  shell: |
-    {{ container_exec_cmd }} ceph config set mgr mgr/dashboard/ssl false || \
-    {{ container_exec_cmd }} ceph config-key set mgr/dashboard/ssl false
+  command: "{{ container_exec_cmd }} ceph config set mgr mgr/dashboard/ssl false"
   delegate_to: "{{ groups[mon_group_name][0] }}"
-  when: dashboard_protocol != "https"
+  when: dashboard_protocol == "http"
 
 - name: enable SSL for dashboard
-  shell: |
-    {{ container_exec_cmd }} ceph config set mgr mgr/dashboard/ssl true || \
-    {{ container_exec_cmd }} ceph config-key set mgr/dashboard/ssl true
+  command: "{{ container_exec_cmd }} ceph config set mgr mgr/dashboard/ssl true"
   delegate_to: "{{ groups[mon_group_name][0] }}"
   when: dashboard_protocol == "https"