diff options
| author | zdc <zdc@users.noreply.github.com> | 2021-06-11 15:13:31 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 15:13:31 +0300 |
| commit | 2df3d01dd7621156dd5003158988dcd9b61836cb (patch) | |
| tree | cbc96bcabcd12aface18f2b2a02642cc84b76389 | |
| parent | 7a070890213bde9862eed779f052ac69eb90172c (diff) | |
| parent | b1433de9e22fbc3ca5bb83276f4d69f26696a292 (diff) | |
| download | vyos-cloud-init-2df3d01dd7621156dd5003158988dcd9b61836cb.tar.gz vyos-cloud-init-2df3d01dd7621156dd5003158988dcd9b61836cb.zip | |
Merge pull request #42 from UnicronNL/current
VMware: T3601 - VMware: T3583
| -rw-r--r-- | cloudinit/config/cc_vyos.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cloudinit/config/cc_vyos.py b/cloudinit/config/cc_vyos.py index cbe29811..65037e3b 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) @@ -314,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': @@ -325,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': @@ -412,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)) @@ -513,7 +514,9 @@ 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'] + # 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', [])) # Configure authentication for default user account |