summaryrefslogtreecommitdiff
path: root/cloudinit/net/activators.py
diff options
context:
space:
mode:
authorJames Falcon <james.falcon@canonical.com>2021-12-02 22:36:37 -0600
committerGitHub <noreply@github.com>2021-12-02 21:36:37 -0700
commitffa6fc88249aa080aa31811a45569a45e567418a (patch)
tree173c86024247ec73e112f1ecbf9ae37ccfa5c3f4 /cloudinit/net/activators.py
parent0fe96a44cde48cc688afe75beb8fd126c8892b8c (diff)
downloadvyos-cloud-init-ffa6fc88249aa080aa31811a45569a45e567418a.tar.gz
vyos-cloud-init-ffa6fc88249aa080aa31811a45569a45e567418a.zip
Fix exception when no activator found (#1129)
Given that there are additional network management tools that we haven't yet supported with activators, we should log a warning and continue without network activation here, especially since this was a no-op for years. LP: #1948681
Diffstat (limited to 'cloudinit/net/activators.py')
-rw-r--r--cloudinit/net/activators.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/cloudinit/net/activators.py b/cloudinit/net/activators.py
index 11149548..137338d8 100644
--- a/cloudinit/net/activators.py
+++ b/cloudinit/net/activators.py
@@ -16,6 +16,10 @@ from cloudinit.net.sysconfig import NM_CFG_FILE
LOG = logging.getLogger(__name__)
+class NoActivatorException(Exception):
+ pass
+
+
def _alter_interface(cmd, device_name) -> bool:
LOG.debug("Attempting command %s for device %s", cmd, device_name)
try:
@@ -271,7 +275,7 @@ def select_activator(priority=None, target=None) -> Type[NetworkActivator]:
tmsg = ""
if target and target != "/":
tmsg = " in target=%s" % target
- raise RuntimeError(
+ raise NoActivatorException(
"No available network activators found%s. Searched "
"through list: %s" % (tmsg, priority))
selected = found[0]