Merge "Always set dashboard_protocol when Ceph Dashboard is enabled" into stable/victoria
This commit is contained in:
commit
65e7cd8bdf
|
@ -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:
|
||||||
|
|
Loading…
Reference in New Issue