Merge pull request #38439 from adk3798/iscsi-stuff

mgr/cephadm: improve iscsi dashboard config

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --cc src/pybind/mgr/cephadm/services/cephadmservice.py
Simple merge

diff --cc src/pybind/mgr/cephadm/services/iscsi.py
Simple merge

diff --cc src/pybind/mgr/cephadm/utils.py
index 752031a5037e1622f3380a89df96a0588edcc59f,c16e8ce77821e65bfe5679db61d83a753fad41e4..ac788039a1340df1d91cb8446012a965f472ada5
--- 1/src/pybind/mgr/cephadm/utils.py
--- 2/src/pybind/mgr/cephadm/utils.py
+++ b/src/pybind/mgr/cephadm/utils.py
@@@ -2,9 -2,10 +2,10 @@@ import loggin
  import re
  import json
  import datetime
+ import socket
  from enum import Enum
  from functools import wraps
 -from typing import Optional, Callable, TypeVar, List, NewType, TYPE_CHECKING
 +from typing import Optional, Callable, TypeVar, List, NewType, TYPE_CHECKING, Any
  from orchestrator import OrchestratorError
  
  if TYPE_CHECKING:

diff --cc src/python-common/ceph/deployment/service_spec.py
Simple merge