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
This commit is contained in:
Francesco Pantano 2020-11-03 12:18:44 +01:00
parent 0a1a16b606
commit 5d9c6edb3f
1 changed files with 5 additions and 1 deletions

View File

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