Merge "Add dashboard_tls_external ceph-ansible parameter"

This commit is contained in:
Zuul 2020-09-21 15:29:17 +00:00 committed by Gerrit Code Review
commit 094631e043
1 changed files with 10 additions and 0 deletions

View File

@ -326,6 +326,9 @@ parameters:
type: string
constraints:
- allowed_values: ['swift', 'file', 'rbd', 's3']
EnableInternalTLS:
type: boolean
default: false
parameter_groups:
- label: deprecated
@ -374,6 +377,7 @@ conditions:
equals:
- {get_param: [ServiceData, net_ip_version_map, {get_param: [ServiceNetMap, CephMonNetwork]}]}
- 6
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
resources:
ContainerImageUrlParts:
@ -615,6 +619,12 @@ outputs:
if:
- dashboard_is_enabled
- map_merge:
- if:
- internal_tls_enabled
-
dashboard_tls_external: true
dashboard_grafana_api_no_ssl_verify: true
- {}
- {get_attr: [CephBaseAnsibleVars, value, vars]}
- dashboard_admin_password: {get_param: CephDashboardAdminPassword}
- grafana_admin_password: {get_param: CephGrafanaAdminPassword}