Skip to content

fix: correct netplan renderer target #6465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aciba90 merged 1 commit into from
Sep 12, 2025
Merged

fix: correct netplan renderer target #6465

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion cloudinit/net/netplan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,14 @@ def render_network_state(
header += "\n"
content = header + content

# Customize target only if explicitly passed in
if target is None:
target_ = target
else:
target_ = fpnplan
Comment on lines +399 to +402
Copy link
Copy Markdown
Collaborator

@blackboxsw blackboxsw Sep 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this one-liner readable enough or is its behavior too convoluted?

Suggested change
if target is None:
target_ = target
else:
target_ = fpnplan
target_ = None if target is None else fpnplan

+1 either way I can see the integration tests succeeding with this PR.


netplan_config_changed = has_netplan_config_changed(fpnplan, content)
if not netplan_api_write_yaml_file(content, target=fpnplan):
if not netplan_api_write_yaml_file(content, target=target_):
fallback_write_netplan_yaml(fpnplan, content)

if self.clean_default:
Expand Down