Add 'keep_configuration' networking config option to internal v1 networking config #6097

a-dubs · 2025-03-13T22:26:12Z

Proposed Commit Message

N/A

Additional Context

Test Steps

Merge type

[] Squash merge using "Proposed Commit Message"
Rebase and merge unique commits. Requires commit messages per-commit each referencing the pull request number (#<PR_NUM>)

TheRealFalcon

+1 to the approach here!

It looks like the key being used by netplan is deprecated, and there's an old PR to update it in netplan.

I'm tempted to call this KeepConfiguration in v1.

cloudinit/sources/DataSourceOracle.py

cloudinit/net/netplan.py

a-dubs · 2025-03-25T18:48:42Z

@TheRealFalcon this is ready for re-review. git history is a mess but will cleanup once reviewing is done.

TheRealFalcon

I left a few minor inline comments (and one somewhat major question), but it generally looks good to me!

cloudinit/config/schemas/schema-network-config-v1.json

cloudinit/sources/DataSourceOracle.py

tests/integration_tests/datasources/test_oci_networking.py

a-dubs

@TheRealFalcon made ur changes!

tests/integration_tests/datasources/test_oci_networking.py

cloudinit/sources/DataSourceOracle.py

TheRealFalcon

LGTM! You mentioned possibly restructuring the commits, so let me know when and how you wanna merge.

a-dubs · 2025-03-31T17:26:20Z

aaaaaand this change is no longer necessary (for the time being) due to similar functionality existing in initramfs-tools on noble+ (ubuntu 24.04 and forward).

Closing! :P

TheRealFalcon · 2025-07-14T15:36:52Z

Continued in #6307

a-dubs · 2025-07-16T15:15:42Z

WE BACK

Issue #6306 for context

a-dubs · 2025-07-16T15:17:42Z

Clearly the commits need squashed. @TheRealFalcon do you reckon it would be best to squash into one commit via the PR desc? or is it worth doing a couple commits (like one for the schema change and then one for the oracle impl)?

TheRealFalcon · 2025-07-16T17:29:18Z

@a-dubs , maybe one for the change, one for Oracle. But I have no problem squashing into 1 either.

a-dubs · 2025-07-16T18:35:59Z

@a-dubs , maybe one for the change, one for Oracle. But I have no problem squashing into 1 either.

Sweet! Will do then.

Also, @TheRealFalcon should I be adding/updating some docs somewhere for this change?

blackboxsw

I was wondering whether we need to document iSCSI keep_configuration behavior in doc/rtd/refefence/datasources/oracle.rst. But I think that is an implementation detail that's not worth publicizing.

cloudinit/config/schemas/schema-network-config-v1.json

doc/rtd/reference/network-config-format-v1.rst

This is necessary for Oracle Baremetal instances on IPv6-only networks which rely on the iscsi connection. Without this, after shutting down the instance, the instance is not recoverable. This setting will be automatically set for all iscsi instances via the Oracle Datasource based on metadata/config files left behind by initramfs during boot on ISCSI instances. PR: canonical#6097

a-dubs · 2025-07-18T11:40:12Z

@TheRealFalcon okay I have split the changes into to two commits and added the PR # reference to the footers of the commit messages!

@blackboxsw I made the easy change to the rtd you requested. So this should all be good to go hopefully.

TheRealFalcon · 2025-07-22T18:21:38Z

@uhryniuk , were you interested in testing this behavior on Oracle?

uhryniuk · 2025-07-23T19:07:59Z

@TheRealFalcon Yeah, if you don't mind were going to fire off a bit more testing but by EOW or hopefully earlier we should be ready to roll. I'll let you know when it's completed!

This is necessary for Oracle Baremetal instances on IPv6-only networks which rely on the iscsi connection. Without this, after shutting down the instance, the instance is not recoverable. This setting will be automatically set for all iscsi instances via the Oracle Datasource based on metadata/config files left behind by initramfs during boot on ISCSI instances. PR: canonical#6097

uhryniuk · 2025-07-25T22:09:43Z

@TheRealFalcon We finished up our testing, we're good to go. @a-dubs just pushed some more changes to fix the failing keep_configuration OCI integration test. The PR CI seems to have failed after the new commit though, but it appears unrelated.

TheRealFalcon · 2025-07-29T14:26:51Z

@a-dubs , can you push a rebase? It should fix the test error.

This config option is only implemented for the Netplan renderer. It is used to designate the connection as 'critical to the system', meaning that special care will be taken not to release the assigned IP when the daemon is restarted. PR: 6097

This is necessary for Oracle Baremetal instances on IPv6-only networks which rely on the iscsi connection. Without this, after shutting down the instance, the instance is not recoverable. This setting will be automatically set for all iscsi instances via the Oracle Datasource based on metadata/config files left behind by initramfs during boot on ISCSI instances. PR: canonical#6097

a-dubs · 2025-07-29T14:36:01Z

@TheRealFalcon done!

TheRealFalcon

LGTM!

This is necessary for Oracle Baremetal instances on IPv6-only networks which rely on the iscsi connection. Without this, after shutting down the instance, the instance is not recoverable. This setting will be automatically set for all iscsi instances via the Oracle Datasource based on metadata/config files left behind by initramfs during boot on ISCSI instances. PR: canonical#6097

github-actions bot added the documentation This Pull Request changes documentation label Mar 13, 2025

TheRealFalcon reviewed Mar 14, 2025

View reviewed changes

cloudinit/sources/DataSourceOracle.py Show resolved Hide resolved

cloudinit/net/netplan.py Outdated Show resolved Hide resolved

blackboxsw mentioned this pull request Mar 19, 2025

chore: switch to has-signed-canonical-cla GH action #6109

Merged

2 tasks

blackboxsw force-pushed the add-critical-networking-config-option branch from 02c8b8d to adc8b8b Compare March 19, 2025 19:51

TheRealFalcon added the CLA not signed The submitter of the PR has not (yet) signed the CLA label Mar 19, 2025

a-dubs marked this pull request as ready for review March 24, 2025 18:25

a-dubs force-pushed the add-critical-networking-config-option branch 2 times, most recently from ae03d70 to 94d007a Compare March 24, 2025 19:01

a-dubs mentioned this pull request Mar 25, 2025

Oracle netplan v2 migration #6024

Closed

1 task

a-dubs force-pushed the add-critical-networking-config-option branch from e243d81 to f7aac83 Compare March 25, 2025 17:12

a-dubs changed the title ~~Add 'critical' networking config option to internal v1 and v2 networking config~~ Add 'keep_configuration' networking config option to internal v1 networking config Mar 25, 2025

a-dubs requested a review from TheRealFalcon March 25, 2025 18:48

blackboxsw removed the CLA not signed The submitter of the PR has not (yet) signed the CLA label Mar 25, 2025

TheRealFalcon reviewed Mar 26, 2025

View reviewed changes

a-dubs commented Mar 26, 2025

View reviewed changes

tests/integration_tests/datasources/test_oci_networking.py Outdated Show resolved Hide resolved

tests/integration_tests/datasources/test_oci_networking.py Show resolved Hide resolved

cloudinit/sources/DataSourceOracle.py Show resolved Hide resolved

a-dubs force-pushed the add-critical-networking-config-option branch 2 times, most recently from 6b3953d to 857d727 Compare March 26, 2025 19:54

TheRealFalcon approved these changes Mar 26, 2025

View reviewed changes

a-dubs marked this pull request as draft March 27, 2025 14:29

a-dubs closed this Mar 31, 2025

uhryniuk mentioned this pull request Jul 14, 2025

[enhancement]: Reopen PR #6097 to add keep_configuration as a netplan option #6306

Closed

TheRealFalcon mentioned this pull request Jul 14, 2025

WIP: Add 'keep_configuration' to v1 config #6307

Closed

2 tasks

a-dubs reopened this Jul 16, 2025

a-dubs marked this pull request as ready for review July 16, 2025 15:16

blackboxsw reviewed Jul 16, 2025

View reviewed changes

cloudinit/config/schemas/schema-network-config-v1.json Show resolved Hide resolved

a-dubs force-pushed the add-critical-networking-config-option branch 3 times, most recently from 8a65570 to f837fcf Compare July 17, 2025 14:09

a-dubs commented Jul 17, 2025

View reviewed changes

doc/rtd/reference/network-config-format-v1.rst Outdated Show resolved Hide resolved

a-dubs force-pushed the add-critical-networking-config-option branch from f837fcf to d253a84 Compare July 18, 2025 11:38

a-dubs force-pushed the add-critical-networking-config-option branch from d253a84 to 8057b7a Compare July 25, 2025 21:49

a-dubs added 2 commits July 29, 2025 10:35

a-dubs force-pushed the add-critical-networking-config-option branch from 8057b7a to 757dcfe Compare July 29, 2025 14:35

TheRealFalcon approved these changes Jul 29, 2025

View reviewed changes

TheRealFalcon merged commit 0fec2e2 into canonical:main Jul 29, 2025
22 checks passed

Uh oh!

Add 'keep_configuration' networking config option to internal v1 networking config #6097

Add 'keep_configuration' networking config option to internal v1 networking config #6097

Uh oh!

Conversation

a-dubs commented Mar 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed Commit Message

Additional Context

Test Steps

Merge type

Uh oh!

TheRealFalcon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

a-dubs commented Mar 25, 2025

Uh oh!

TheRealFalcon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

a-dubs left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

TheRealFalcon left a comment

Choose a reason for hiding this comment

Uh oh!

a-dubs commented Mar 31, 2025

Uh oh!

TheRealFalcon commented Jul 14, 2025

Uh oh!

a-dubs commented Jul 16, 2025

Uh oh!

a-dubs commented Jul 16, 2025

Uh oh!

TheRealFalcon commented Jul 16, 2025

Uh oh!

a-dubs commented Jul 16, 2025

Uh oh!

blackboxsw left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

a-dubs commented Jul 18, 2025

Uh oh!

TheRealFalcon commented Jul 22, 2025

Uh oh!

uhryniuk commented Jul 23, 2025

Uh oh!

uhryniuk commented Jul 25, 2025

Uh oh!

TheRealFalcon commented Jul 29, 2025

Uh oh!

a-dubs commented Jul 29, 2025

Uh oh!

TheRealFalcon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

a-dubs commented Mar 13, 2025 •

edited

Loading