Keep dhclient default on focal #4923
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
verify_clean_log assumed shadowed warning messages to be contained in a single line entry with a `[WARNING]`, but warnings can be multiline as: ``` 2024-02-16 15:01:49,354 - activators.py[WARNING]: Running ['netplan', 'apply'] resulted in stderr output: Cannot call Open vSwitch: ovsdb-server.service is not running. Failed to connect system bus: No such file or directory Falling back to a hard restart of systemd-networkd.service ``` wrongly asserting the number of expected_warnings. Make this check more reliable by asserting that the number of lines containing `WARNINGS` is less or equal than the number of appearances of the shadowed warning messages.
Create generalized ubuntu_pro.properties definition to be shared in the ubuntu_pro and ubuntu_advantage property schemas as they are identical schema definitions. Given that ubuntu_advantage is now deprecated, add the schema keys deprecated, deprecated_version and deprecated description to provide descriptive warning logs when deprecated keys are present in user-data.
Update cc_ubuntu_advantage module, comments, logs and examples to prefer ubuntu_pro key over ubuntu_advantage to align with the updated product naming. - Deprecate ubuntu_advantage key and represent ubuntu_pro is prioritized - Update product URL to ubuntu.com/pro instead of /advantage - Update log messaging and examples to reference Ubuntu Pro instead of Ubuntu Advantage - Add logic to error when both ubuntu_advantage and ubuntu-advantage keys are present in userdata.
Move the cc_ubuntu_advantage module to cc_ubuntu_pro, updating schema definitions to align with new module name and default /etc/cloud/cloud.cfg to represent ubuntu_pro instead of ubuntu_advantage module.
Also update stale /etc/cloud/cloud.cfg example adding new config modules present in tip of tree.
…#4906) The files in the sysvinit/gentoo directory are OpenRC files not specific to Gentoo and are used by other distro (i.e. Alpine).
On focal we detect NoCloud rather than LXD, so ensure the test reflects this.
Saw "cat: /before-local.start-nostatusjson: No such file or directory" failures. After this change, I no longer see these failures.
…onical#4876) Unlike the majority of other Linux distros /dev/mapper entries in Alpine Linux are NOT symlinks to /dev/dm-X block devices but rather are actual block devices themselves. This is a side-effect of Alpine's use of mdev, rather than udev, in its initramfs. Therefore this change works out the corresponding /dev/dm-X for any /dev/mapper/XYZ device on Alpine.
isc-dhcp-client is no longer supported by upstream BREAKING CHANGE: dhcpcd has been promoted to the default dhcp client. Previous behavior can be configured in cloud.cfg via the dhcp_client_priority key.
patches: debian/patches/retain-ec2-default-net-update-events.patch
Keep dhclient as default client.
TheRealFalcon
approved these changes
Feb 20, 2024
| - d/p/retain-netplan-world-readable.patch | ||
| - d/p/status-do-not-remove-duplicated-data.patch | ||
| - d/p/status-retain-recoverable-error-exit-code.patch | ||
| * Upstream snapshot based on upstream/main at c948e418. | ||
| * Upstream snapshot based on upstream/main at a4140119. | ||
| * Upstream snapshot based on 6d61b63 at 6d61b63f. |
There was a problem hiding this comment.
Was this intentional? Why not on main? Either way, shouldn't hurt anything, so +1.
There was a problem hiding this comment.
Was this intentional? Why not on main? Either way, shouldn't hurt anything, so +1.
Yes, because I wanted this release to match jammy and mantic. They should all have released on the same commit.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Context
New snapshot, reverts #4912
Merge type