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

Ubuntu/devel #4735

Merged
merged 17 commits into from
Jan 4, 2024
Merged

Ubuntu/devel #4735

merged 17 commits into from
Jan 4, 2024

Conversation

aciba90
Copy link
Contributor

@aciba90 aciba90 commented Jan 4, 2024

Do not squash

Upstream snapshot release including #4699.

Steps to reproduce

git checkout upstream/ubuntu/devel -B ubuntu/devel
new_upstream_snapshot.py -c upstream/main
dch -r -D noble ''
git commit -m 'releasing cloud-init version 24.1~2gb6a1c635-0ubuntu1' debian/changelog
git tag ubuntu/24.1_2gb6a1c635-0ubuntu1

Checks

  • build-package
  • sbuild --dist noble ../out/cloud-init_24.1~2gb6a1c635-0ubuntu1.dsc
  • No new lintian warnings / errors

waveform80 and others added 17 commits December 15, 2023 10:46
The cloud-final service (which may include apt or HTTPS operations
requiring certificate verification) must run after the clock has been
synchronized. Otherwise, systems lacking an RTC (notably the Raspberry
Pi) risk hitting the certificates that are valid "in the future"
because their clock is wrong.

This change was tested on Ubuntu mantic (23.10) server images on a
Raspberry Pi both connected to a LAN, and disconnected from a LAN. In
both cases, start-up time was not affected significantly, and
cloud-final started after time-sync had finished (successfully or
otherwise).

Fixes canonical#3928
LP: #1951639
We throw an error when supb isn't mocked in a test. However, there
are many broad exception handlers that wind up swallowing the error.
This commit changes it from an AssertionError to a new error that
inherits from BaseException so that it doesn't get silently swallowed.

Also fix any tests that are impacted.
When an error is encountered while trying to parse a jinja template,
the traceback is automatically parsed to get the specific error and
the line number that caused this error, and then this information is
turned into a user-friendly single-line error message.

The cloud-init runtime will log these error messages when jinja
syntax errors are encountered in the cloud-config file. For the
query, render, and schema commands, the nasty traceback is caught
and a single line error message is given to the user instead.

Fixes canonicalGH-4360
our setup.py didn't relocate our USR_LIB_EXEC path on OpenBSD.
Thus, leaving tools installed in /usr/lib/cloud-init on that platform.
OpenBSD ports install things in /usr/local, so follow suit.

Sponsored by: The FreeBSD Foundation
…4714)

This is a more appropriate categorization for these logs and
this log level will ensure they are logged to the console.

Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
fix: Correct v2 NetworkManager route rendering

Because network v2 route defintions can have mixed v4 and v6 routes, we
need to determine the IP family per route rather than per subnet.

Similar, ensure dns-search is rendered correctly.

Fixes canonicalGH-4518
…cal#4724)

chore: Add log message when create_hostname_file key is false

Setting create_hostname_file to False while trying to set the
hostname via userdata can result in the hostname not being
correctly set (it is overwritten by the cloud provider's DHCP
service).  This change adds a log line every time a hostname file
is not created due to create_hostname_file being False for easier
debugging of that situation.
On the page for contributing to the docs, there is no direct link
to the docs source code. This change adds a link to the top of
that page.
…al#4699)

If deb822 sources format is used and a preexisting
/etc/apt/sources.list exists, then disable the old sources file.
This prevents user-facing warnings while operating with apt or
apt-get and other possible conflicts.
    
This is safe to do as cloud-init owns the base APT configuration which
typically/historically involved overwriting /etc/apt/sources.list

Fixes canonicalGH-4691
LP: #2045086
Commit de5fc36 added a new return code (2) for indicating disabled status.
Without this change, ds-identify will re-run when it shouldn't, and users will
see a bogus log message:

    previous run returned unexpected '$ret'. Re-running.
…l#4726)

Removed cc_migrator module means 2 less events, one from start, one
from end.
@blackboxsw blackboxsw merged commit dd5bcf7 into canonical:ubuntu/devel Jan 4, 2024
27 checks passed
@blackboxsw
Copy link
Collaborator

Closing #4731 in favor of this branch for upload. +1 on this PR

@blackboxsw blackboxsw mentioned this pull request Jan 4, 2024
6 tasks
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.

9 participants