From 5d9c6edb3fda626d5495b78ca39f34595d02121b Mon Sep 17 00:00:00 2001
From: Francesco Pantano <fpantano@redhat.com>
Date: Tue, 3 Nov 2020 12:18:44 +0100
Subject: [PATCH] Always set dashboard_protocol when Ceph Dashboard is enabled

When the Ceph dashboard is enabled, ceph-ansible is going to set
dashboard_protocol: 'https' by default.
In TripleO, https is enabled only if tls-everywhere templates are
provided. For this reason, dashboard_protocol: 'http' should be
enforced to prevent issues when ceph-ansible is triggered.

Closes-Bug: #1902729
Change-Id: I6f15ab03e64318df707812d8a4127399bdfa0c6d
---
 deployment/ceph-ansible/ceph-mgr.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/deployment/ceph-ansible/ceph-mgr.yaml b/deployment/ceph-ansible/ceph-mgr.yaml
index b6aab9161e..87f089787e 100644
--- a/deployment/ceph-ansible/ceph-mgr.yaml
+++ b/deployment/ceph-ansible/ceph-mgr.yaml
@@ -84,6 +84,11 @@ resources:
           dashboard_rgw_api_no_ssl_verify: false
           dashboard_port: {get_param: CephDashboardPort}
           dashboard_admin_user_ro: {get_param: CephDashboardAdminRO}
+          dashboard_protocol:
+            if:
+              - internal_tls_enabled
+              - 'https'
+              - 'http'
 
 outputs:
   role_data:
@@ -125,7 +130,6 @@ outputs:
                       - {get_attr: [CephMgrAnsibleVars, value, vars]}
                       - dashboard_crt: /etc/pki/tls/certs/ceph_dashboard.crt
                       - dashboard_key: /etc/pki/tls/private/ceph_dashboard.key
-                      - dashboard_protocol: 'https'
                     - {get_attr: [CephMgrAnsibleVars, value, vars]}
               - name: generate ceph-ansible group vars mgrs
                 copy: