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>

diff --git a/roles/ceph-dashboard/tasks/configure_dashboard.yml b/roles/ceph-dashboard/tasks/configure_dashboard.yml
index 24ed1458b73f829eea3823a91640ffe3dfe22fa2..ba7e57049d031d7683ac949160e6f512a6feb9ca 100644 (file)
--- 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"