Skip to content
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.

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

Revert "net: allow dhcp6 configuration from generate_fallback_configu… #4607

Merged
merged 1 commit into from
Nov 15, 2023

Conversation

TheRealFalcon
Copy link
Member

Proposed Commit Message

Revert "net: allow dhcp6 configuration from generate_fallback_configu…
…ration() (#4474)"

This reverts commit 518047aea93d502aefae808921b11d0cfe2e7fd9.

This commit could cause issues in bringing up the network, especially
because in non-netplan NetworkManager environments, may-fail=false .

Additional Context

Test Steps

Checklist

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>)

…ration() (canonical#4474)"

This reverts commit 518047a.

This commit could cause issues in bringing up the network, especially
because in non-netplan NetworkManager environments, may-fail=false .
Copy link
Member

@holmanb holmanb left a comment

Choose a reason for hiding this comment

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

Agreed, this is the right thing for now.

I agree with the original intent of this PR, but a future approach needs to be able to properly handle the following matrix:

  1. ipv4-only, ipv6-only, and ipv6+ipv4
  2. all currently supported renderers

Since the reverted approach appears to break an ipv4-only system with NetworkManager, and also an ipv6-only system with NetworkManager, reverting makes sense. Hopefully a future implementation will come with tests to validate behavior on at least a couple of different renderer-network configurations.

@TheRealFalcon TheRealFalcon merged commit 29ed5f5 into canonical:main Nov 15, 2023
@TheRealFalcon TheRealFalcon deleted the revert-dhcp6 branch November 15, 2023 14:43
ani-sinha added a commit to ani-sinha/cloud-init that referenced this pull request Nov 23, 2023
ani-sinha added a commit to ani-sinha/cloud-init that referenced this pull request Nov 27, 2023
…guration()" (canonical#4607)

This reverts commit 29ed5f5 and therefore,
re-applies the commit 518047a .

The issue that caused the reversal of 518047a
is fixed by the earlier commit:
a8da6df ("net/network_manager: do not set "may-fail" to False for both ipv4 and ipv6")

Signed-off-by: Ani Sinha <anisinha@redhat.com>
ani-sinha added a commit to ani-sinha/cloud-init that referenced this pull request Nov 29, 2023
…guration()" (canonical#4607)

This reverts commit 29ed5f5 and therefore,
re-applies the commit 518047a .

The issue that caused the reversal of 518047a
is fixed by the earlier commit:
a8da6df ("net/network_manager: do not set "may-fail" to False for both ipv4 and ipv6")

Signed-off-by: Ani Sinha <anisinha@redhat.com>
ani-sinha added a commit to ani-sinha/cloud-init that referenced this pull request Nov 29, 2023
…guration()" (canonical#4607)

This reverts commit 29ed5f5 and therefore,
re-applies the commit 518047a .

The issue that caused the reversal of 518047a
is fixed by the earlier commit:
a8da6df ("net/network_manager: do not set "may-fail" to False for both ipv4 and ipv6")

Signed-off-by: Ani Sinha <anisinha@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants