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

openstack-archive · May 5, 2021 · f6efe31 · f6efe31
2 parents 0b30e74 + 92f722a
commit f6efe31
Showing 1 changed file with 34 additions and 33 deletions.
diff --git a/deployment/cephadm/ceph-mgr.yaml b/deployment/cephadm/ceph-mgr.yaml
@@ -146,36 +146,37 @@ outputs:
             network: {get_param: [ServiceNetMap, CephDashboardNetwork]}
             type: node
       deploy_steps_tasks:
-        - name: Certificate generation
-          when:
-            - step|int == 1
-            - enable_internal_tls
-          block:
-            - include_role:
-                name: linux-system-roles.certificate
-              vars:
-                certificate_requests:
-                  - name: ceph_dashboard
-                    dns:
-                      str_replace:
-                        template: "{{fqdn_$NETWORK}}"
-                        params:
-                          $NETWORK: {get_param: [ServiceNetMap, CephDashboardNetwork]}
-                    principal:
-                      str_replace:
-                        template: "ceph_dashboard/{{fqdn_$NETWORK}}@{{idm_realm}}"
-                        params:
-                          $NETWORK: {get_param: [ServiceNetMap, CephDashboardNetwork]}
-                    run_after: |
-                      # Get mgr systemd unit
-                      mgr_unit=$(systemctl list-units | awk '/ceph-mgr/ {print $1}')
-                      # Restart the mgr systemd unit
-                      if [ -n "$mgr_unit" ]; then
-                          systemctl restart "$mgr_unit"
-                      fi
-                    key_size:
-                      if:
-                        - key_size_override_set
-                        - {get_param: CephCertificateKeySize}
-                        - {get_param: CertificateKeySize}
-                    ca: ipa
+        if:
+          - internal_tls_enabled
+          - - name: Certificate generation
+              when:
+                - step|int == 1
+              block:
+                - include_role:
+                    name: linux-system-roles.certificate
+                  vars:
+                    certificate_requests:
+                      - name: ceph_dashboard
+                        dns:
+                          str_replace:
+                            template: "{{fqdn_$NETWORK}}"
+                            params:
+                              $NETWORK: {get_param: [ServiceNetMap, CephDashboardNetwork]}
+                        principal:
+                          str_replace:
+                            template: "ceph_dashboard/{{fqdn_$NETWORK}}@{{idm_realm}}"
+                            params:
+                              $NETWORK: {get_param: [ServiceNetMap, CephDashboardNetwork]}
+                        run_after: |
+                          # Get mgr systemd unit
+                          mgr_unit=$(systemctl list-units | awk '/ceph-mgr/ {print $1}')
+                          # Restart the mgr systemd unit
+                          if [ -n "$mgr_unit" ]; then
+                              systemctl restart "$mgr_unit"
+                          fi
+                        key_size:
+                          if:
+                            - key_size_override_set
+                            - {get_param: CephCertificateKeySize}
+                            - {get_param: CertificateKeySize}
+                        ca: ipa