summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Hagen <kim@sentrium.io>2021-03-29 14:01:57 -0500
committerKim Hagen <kim@sentrium.io>2021-03-29 14:03:11 -0500
commit2089f4d8a3c9b0910465ff0a3ae2c0688ac930ff (patch)
treecb78f8f16400895117d94fba7b96dff3297e2de1
parent8d23e422288c18612d7149293c165c75a40b72df (diff)
downloadvyos-cloud-init-2089f4d8a3c9b0910465ff0a3ae2c0688ac930ff.tar.gz
vyos-cloud-init-2089f4d8a3c9b0910465ff0a3ae2c0688ac930ff.zip
domain-name: T3446: Cloudinit error message when empty domain is passed to filter.
-rw-r--r--cloudinit/config/cc_vyos.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/cloudinit/config/cc_vyos.py b/cloudinit/config/cc_vyos.py
index f9384e8b..06f5d263 100644
--- a/cloudinit/config/cc_vyos.py
+++ b/cloudinit/config/cc_vyos.py
@@ -427,8 +427,9 @@ def set_config_hostname(config, hostname, fqdn):
if fqdn:
try:
domain_name = fqdn.partition("{}.".format(hostname))[2]
- logger.debug("Configuring domain-name to: {}".format(hostname_filter(domain_name)))
- config.set(['system', 'domain-name'], value=hostname_filter(domain_name), replace=True)
+ if domain_name:
+ logger.debug("Configuring domain-name to: {}".format(hostname_filter(domain_name)))
+ config.set(['system', 'domain-name'], value=hostname_filter(domain_name), replace=True)
except Exception as err:
logger.error("Failed to configure domain-name: {}".format(err))