Merge pull request #42990 from rhcs-dashboard/wip-52325-pacific

pacific: pybind/mgr: Fix IPv6 url generation

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

diff --cc src/pybind/mgr/cephadm/services/monitoring.py
index 0e83ecda35d52f2abe110573f7d96c05d73e3362,bfd79eab08902fee3ce1ddc2a5baf58f6fd43bab..d86c5a8803a6dd33553bdea3d79663aa23776f35
--- 1/src/pybind/mgr/cephadm/services/monitoring.py
--- 2/src/pybind/mgr/cephadm/services/monitoring.py
+++ b/src/pybind/mgr/cephadm/services/monitoring.py
@@@ -6,10 -6,10 +6,10 @@@ from typing import List, Any, Tuple, Di
  from mgr_module import HandleCommandResult
  
  from orchestrator import DaemonDescription
 -from ceph.deployment.service_spec import AlertManagerSpec
 +from ceph.deployment.service_spec import AlertManagerSpec, ServiceSpec
  from cephadm.services.cephadmservice import CephadmService, CephadmDaemonDeploySpec
  from cephadm.services.ingress import IngressSpec
- from mgr_util import verify_tls, ServerConfigException, create_self_signed_cert
+ from mgr_util import verify_tls, ServerConfigException, create_self_signed_cert, build_url
  
  logger = logging.getLogger(__name__)
  

diff --cc src/pybind/mgr/dashboard/module.py
Simple merge

diff --cc src/pybind/mgr/dashboard/services/rgw_client.py
index b055946d09e3b13fb2b089ae1d9dedc0c8f1cace,76b115dcc54e27587c5fb62ba3428a1967947361..e5f614ade228e6024cd542b6948ce1093567ff48
--- 1/src/pybind/mgr/dashboard/services/rgw_client.py
--- 2/src/pybind/mgr/dashboard/services/rgw_client.py
+++ b/src/pybind/mgr/dashboard/services/rgw_client.py
@@@ -7,8 -6,9 +7,10 @@@ import loggin
  import re
  import xml.etree.ElementTree as ET  # noqa: N814
  from distutils.util import strtobool
 +from subprocess import SubprocessError
  
+ from mgr_util import build_url
+ 
  from .. import mgr
  from ..awsauth import S3Auth
  from ..exceptions import DashboardException