openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Always set dashboard_protocol when Ceph Dashboard is enabled" into stable/train

This commit is contained in:
Zuul 2020-11-08 00:59:40 +00:00 committed by Gerrit Code Review
parent ef2ebb18d1 a1f4c48830
commit 7690ae6536
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/ceph-ansible/ceph-mgr.yaml
View File

@ -80,6 +80,11 @@ resources:
dashboard_rgw_api_no_ssl_verify: false
dashboard_port: 8444
dashboard_admin_user_ro: {get_param: CephDashboardAdminRO}
dashboard_protocol:
if:
- internal_tls_enabled
- 'https'
- 'http'
outputs:
role_data:
@ -112,7 +117,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: