From c1d00c2b17eea0c7fc05cb1852a3af83cd8b0a70 Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Tue, 1 Jun 2021 03:36:37 -0500 Subject: T3583: Overwrite default config ntp settings when custom ntp servers are provided. --- cloudinit/config/cc_vyos.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cloudinit/config/cc_vyos.py b/cloudinit/config/cc_vyos.py index cbe29811..3c5a5923 100644 --- a/cloudinit/config/cc_vyos.py +++ b/cloudinit/config/cc_vyos.py @@ -157,6 +157,7 @@ def set_config_ovf(config, ovf_environment): # Configure NTP servers if ntp_string: ntp_list = list(ntp_string.replace(' ', '').split(',')) + config.delete(['system', 'ntp']) for server in ntp_list: logger.debug("Configuring NTP server: {}".format(server)) config.set(['system', 'ntp', 'server'], value=server, replace=False) -- cgit v1.2.3 From 025ff72784d2f45bbe361fe451a69c5cde8bfdc1 Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Sun, 6 Jun 2021 08:11:25 -0500 Subject: T3601: Error in ssh keys for vmware cloud-init if ssh keys is left empty. --- cloudinit/config/cc_vyos.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudinit/config/cc_vyos.py b/cloudinit/config/cc_vyos.py index 3c5a5923..59571e15 100644 --- a/cloudinit/config/cc_vyos.py +++ b/cloudinit/config/cc_vyos.py @@ -514,7 +514,7 @@ def handle(name, cfg, cloud, log, _args): # configure system logins # Prepare SSH public keys for default user, to be sure that global keys applied to the default account (if it exist) - ssh_keys = metadata_v1['public_ssh_keys'] + ssh_keys = [key for key in metadata_v1['public_ssh_keys'] if key ] # append SSH keys from cloud-config ssh_keys.extend(cfg.get('ssh_authorized_keys', [])) # Configure authentication for default user account -- cgit v1.2.3 From 9f5a20ff749918694cae74d95eb8ea1142f540bb Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Mon, 7 Jun 2021 15:53:15 -0500 Subject: T3339: Cloud-Init domain search setting not applied. --- cloudinit/config/cc_vyos.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cloudinit/config/cc_vyos.py b/cloudinit/config/cc_vyos.py index 59571e15..e1516f1b 100644 --- a/cloudinit/config/cc_vyos.py +++ b/cloudinit/config/cc_vyos.py @@ -315,7 +315,7 @@ def set_config_interfaces_v1(config, iface_config): if 'dns_search' in subnet: for item in subnet['dns_search']: logger.debug("Configuring DNS search domain for {}: {}".format(iface_name, item)) - config.set(['system', 'domain-search'], value=item, replace=False) + config.set(['system', 'domain-search', 'domain'], value=item, replace=False) # configure nameservers if iface_config['type'] == 'nameserver': @@ -326,7 +326,7 @@ def set_config_interfaces_v1(config, iface_config): if 'search' in iface_config: for item in iface_config['search']: logger.debug("Configuring DNS search domain: {}".format(item)) - config.set(['system', 'domain-search'], value=item, replace=False) + config.set(['system', 'domain-search', 'domain'], value=item, replace=False) # configure routes if iface_config['type'] == 'route': @@ -413,7 +413,7 @@ def set_config_interfaces_v2(config, iface_name, iface_config): if 'search' in iface_config['nameservers']: for item in iface_config['nameservers']['search']: logger.debug("Configuring DNS search domain for {}: {}".format(iface_name, item)) - config.set(['system', 'domain-search'], value=item, replace=False) + config.set(['system', 'domain-search', 'domain'], value=item, replace=False) if 'addresses' in iface_config['nameservers']: for item in iface_config['nameservers']['addresses']: logger.debug("Configuring DNS nameserver for {}: {}".format(iface_name, item)) -- cgit v1.2.3 From b1433de9e22fbc3ca5bb83276f4d69f26696a292 Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Wed, 9 Jun 2021 14:43:58 -0500 Subject: Add descrition for why the the ssh_keys variable is parsed. --- cloudinit/config/cc_vyos.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cloudinit/config/cc_vyos.py b/cloudinit/config/cc_vyos.py index e1516f1b..65037e3b 100644 --- a/cloudinit/config/cc_vyos.py +++ b/cloudinit/config/cc_vyos.py @@ -514,6 +514,8 @@ def handle(name, cfg, cloud, log, _args): # configure system logins # Prepare SSH public keys for default user, to be sure that global keys applied to the default account (if it exist) + # If the ssh key is left emty on an OVA deploy the OVF datastore passes an empty string which generates an invalid key error. + # Set the ssh_keys variable from the metadata_v1['public_ssh_keys'] checked for empty strings. ssh_keys = [key for key in metadata_v1['public_ssh_keys'] if key ] # append SSH keys from cloud-config ssh_keys.extend(cfg.get('ssh_authorized_keys', [])) -- cgit v1.2.3