diff options
| author | Alberto Contreras <alberto.contreras@canonical.com> | 2022-08-24 20:28:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 13:28:10 -0500 |
| commit | f1d901c9b21fcf1073d663f4190badce662ff3da (patch) | |
| tree | 48cbd97fd0d2dd059136233344d2d7952a7672c3 /cloudinit/cmd | |
| parent | 5d12b43499ac6dac81af21aa96bd243729e6769c (diff) | |
| download | cloud-init-git-f1d901c9b21fcf1073d663f4190badce662ff3da.tar.gz | |
net: Passthough v2 netconfigs in netplan systems (#1650)
Adhere to Netplan Passthrough documented behavior,
not limiting v2 netplan configs to the subset of
props that cloud-init supports.
LP: #1978543
Diffstat (limited to 'cloudinit/cmd')
| -rwxr-xr-x | cloudinit/cmd/devel/net_convert.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cloudinit/cmd/devel/net_convert.py b/cloudinit/cmd/devel/net_convert.py index 3e6cdd95..50e268a2 100755 --- a/cloudinit/cmd/devel/net_convert.py +++ b/cloudinit/cmd/devel/net_convert.py @@ -133,13 +133,8 @@ def handle_args(name, args): config = ovf.Config(ovf.ConfigFile(args.network_data.name)) pre_ns = ovf.get_network_config_from_conf(config, False) - ns = network_state.parse_net_config_data(pre_ns) - - if args.debug: - sys.stderr.write("\n".join(["", "Internal State", yaml.dump(ns), ""])) distro_cls = distros.fetch(args.distro) distro = distro_cls(args.distro, {}, None) - config = {} if args.output_kind == "eni": r_cls = eni.Renderer config = distro.renderer_configs.get("eni") @@ -165,6 +160,11 @@ def handle_args(name, args): raise RuntimeError("Invalid output_kind") r = r_cls(config=config) + ns = network_state.parse_net_config_data(pre_ns, renderer=r) + + if args.debug: + sys.stderr.write("\n".join(["", "Internal State", yaml.dump(ns), ""])) + sys.stderr.write( "".join( [ |