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
(cherry picked from commit 5d9c6edb3f
)
This commit is contained in:
parent
d7d9e05ff8
commit
9991cadc3f
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue