From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Sat, 12 Dec 2020 00:09:14 +0000 (+0100)
Subject: Merge pull request #38439 from adk3798/iscsi-stuff
X-Git-Tag: v17.0.0~319
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=acde2ff5754684c07275646adb2b61aea6b3313f;p=ceph-ci.git

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>
---

acde2ff5754684c07275646adb2b61aea6b3313f
diff --cc src/pybind/mgr/cephadm/utils.py
index 752031a5037,c16e8ce7782..ac788039a13
--- a/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: