From: Yuri Weinstein Date: Wed, 8 Sep 2021 15:51:32 +0000 (-0700) Subject: Merge pull request #42990 from rhcs-dashboard/wip-52325-pacific X-Git-Tag: v16.2.6~13 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d24fe5ecac6d6271190f8aa55da049756b86242;p=ceph.git Merge pull request #42990 from rhcs-dashboard/wip-52325-pacific pacific: pybind/mgr: Fix IPv6 url generation Reviewed-by: Sebastian Wagner Reviewed-by: Avan Thakkar Reviewed-by: Pere Diaz Bou --- 1d24fe5ecac6d6271190f8aa55da049756b86242 diff --cc src/pybind/mgr/cephadm/services/monitoring.py index 0e83ecda35d5,bfd79eab0890..d86c5a8803a6 --- a/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/services/rgw_client.py index b055946d09e3,76b115dcc54e..e5f614ade228 --- a/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