]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: ingress: remove eth0 default
authorSage Weil <sage@newdream.net>
Mon, 3 May 2021 15:02:24 +0000 (11:02 -0400)
committerSage Weil <sage@newdream.net>
Wed, 19 May 2021 12:43:14 +0000 (08:43 -0400)
Better to raise an error; eth0 will never be correct.

Signed-off-by: Sage Weil <sage@newdream.net>
src/pybind/mgr/cephadm/services/ingress.py

index 99e957bc7e321ac34460e75fcc2999dcfc7dc892..2a2c7be61008f4061b1208cb427c7760075025d4 100644 (file)
@@ -6,7 +6,7 @@ from typing import List, Dict, Any, Tuple, cast, Optional
 
 from ceph.deployment.service_spec import IngressSpec
 from cephadm.utils import resolve_ip
-
+from orchestrator import OrchestratorError
 from cephadm.services.cephadmservice import CephadmDaemonDeploySpec, CephService
 
 logger = logging.getLogger(__name__)
@@ -209,7 +209,9 @@ class IngressService(CephService):
                     )
                     break
         if not interface:
-            interface = 'eth0'
+            raise OrchestratorError(
+                "Unable to identify interface for {spec.virtual_ip} on {host}"
+            )
 
         # script to monitor health
         script = '/usr/bin/false'