openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Do not ask for cephdashboard certificates when it is disabled"

Browse Source
This commit is contained in:
Zuul 2021-05-05 16:12:14 +00:00 committed by Gerrit Code Review
commit f6efe31ce9
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
deployment/cephadm/ceph-mgr.yaml
View File

@ -146,36 +146,37 @@ outputs:
network: {get_param: [ServiceNetMap, CephDashboardNetwork]} network: {get_param: [ServiceNetMap, CephDashboardNetwork]}
type: node type: node
deploy_steps_tasks: deploy_steps_tasks:
- name: Certificate generation if:
when: - internal_tls_enabled
- step|int == 1 - - name: Certificate generation
- enable_internal_tls when:
block: - step|int == 1
- include_role: block:
name: linux-system-roles.certificate - include_role:
vars: name: linux-system-roles.certificate
certificate_requests: vars:
- name: ceph_dashboard certificate_requests:
dns: - name: ceph_dashboard
str_replace: dns:
template: "{{fqdn_$NETWORK}}" str_replace:
params: template: "{{fqdn_$NETWORK}}"
$NETWORK: {get_param: [ServiceNetMap, CephDashboardNetwork]} params:
principal: $NETWORK: {get_param: [ServiceNetMap, CephDashboardNetwork]}
str_replace: principal:
template: "ceph_dashboard/{{fqdn_$NETWORK}}@{{idm_realm}}" str_replace:
params: template: "ceph_dashboard/{{fqdn_$NETWORK}}@{{idm_realm}}"
$NETWORK: {get_param: [ServiceNetMap, CephDashboardNetwork]} params:
run_after: | $NETWORK: {get_param: [ServiceNetMap, CephDashboardNetwork]}
# Get mgr systemd unit run_after: |
mgr_unit=$(systemctl list-units | awk '/ceph-mgr/ {print $1}') # Get mgr systemd unit
# Restart the mgr systemd unit mgr_unit=$(systemctl list-units | awk '/ceph-mgr/ {print $1}')
if [ -n "$mgr_unit" ]; then # Restart the mgr systemd unit
systemctl restart "$mgr_unit" if [ -n "$mgr_unit" ]; then
fi systemctl restart "$mgr_unit"
key_size: fi
if: key_size:
- key_size_override_set if:
- {get_param: CephCertificateKeySize} - key_size_override_set
- {get_param: CertificateKeySize} - {get_param: CephCertificateKeySize}
ca: ipa - {get_param: CertificateKeySize}
ca: ipa