diff options
| author | zdc <zdc@users.noreply.github.com> | 2020-10-01 23:07:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-01 23:07:27 +0300 |
| commit | f40f1b59a4e1fc316edd6da5c89f7b0f8d904d4e (patch) | |
| tree | c28b76f128f7668f96de547e198d5af946e46d9d | |
| parent | 8f175e027c27bae0cbc566d643dbabbbecac60a7 (diff) | |
| parent | ceaa51c3df393d8bcfb8aa58e47d9d2eb7a9efb2 (diff) | |
| download | vyos-cloud-init-f40f1b59a4e1fc316edd6da5c89f7b0f8d904d4e.tar.gz vyos-cloud-init-f40f1b59a4e1fc316edd6da5c89f7b0f8d904d4e.zip | |
Merge pull request #22 from zdc/T2117-equuleus
cc_vyos: T2117: Revert back to _find_networking_config() function
| -rw-r--r-- | cloudinit/config/cc_vyos.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cloudinit/config/cc_vyos.py b/cloudinit/config/cc_vyos.py index 35e66952..bd85db12 100644 --- a/cloudinit/config/cc_vyos.py +++ b/cloudinit/config/cc_vyos.py @@ -29,6 +29,7 @@ from cloudinit.ssh_util import AuthKeyLineParser from cloudinit.distros import ug_util from cloudinit.settings import PER_INSTANCE from cloudinit.sources import INSTANCE_JSON_FILE +from cloudinit.stages import Init from cloudinit.util import load_file, load_json, get_hostname_fqdn from cloudinit.sources.DataSourceOVF import get_properties as ovf_get_properties from vyos.configtree import ConfigTree @@ -447,8 +448,10 @@ def handle(name, cfg, cloud, log, _args): vendordata = cloud.datasource.vendordata logger.debug("Vendor-Data: {}".format(vendordata)) # Network-config - netcfg = cloud.datasource.network_config + init_stage = Init() + (netcfg, netcfg_src) = init_stage._find_networking_config() logger.debug("Network-config: {}".format(netcfg)) + logger.debug("Network-config source: {}".format(netcfg_src)) # Hostname with FQDN (if exist) (hostname, fqdn) = get_hostname_fqdn(cfg, cloud, metadata_only=True) logger.debug("Hostname: {}, FQDN: {}".format(hostname, fqdn)) |