openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Always set dashboard_protocol when Ceph Dashboard is enabled"

This commit is contained in:
Zuul 2020-11-06 17:46:46 +00:00 committed by Gerrit Code Review
parent af5c98383a 5d9c6edb3f
commit 2e2a094570
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

@ -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: