Merge "Always set dashboard_protocol when Ceph Dashboard is enabled" into stable/train

deployment/ceph-ansible/ceph-mgr.yaml

@@ -80,6 +80,11 @@ resources:
           dashboard_rgw_api_no_ssl_verify: false
           dashboard_port: 8444
           dashboard_admin_user_ro: {get_param: CephDashboardAdminRO}
+          dashboard_protocol:
+            if:
+              - internal_tls_enabled
+              - 'https'
+              - 'http'
 
 outputs:
   role_data:
@@ -112,7 +117,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: