ubuntu-advantage-script:release-31-focal

Last commit made on 2024-02-15
Get this branch:
git clone -b release-31-focal https://git.launchpad.net/ubuntu-advantage-script

Branch merges

Branch information

Name:
release-31-focal
Repository:
lp:ubuntu-advantage-script

Recent commits

ab64d63... by Grant Orndorff

backport

285e9dd... by Grant Orndorff

changelog 31.1

00aea08... by Grant Orndorff

tests: remove stdlib detail from unit test

This message is a detail of the stdlib and could change and it doesn't
matter to us. The important thing that this test is testing is that
base.UAEntitlement cannot be instantiated itself and will raise a
TypeError.

ac0c7df... by Grant Orndorff

tests: various small fixes in prep for verifying 31

ae56423... by Grant Orndorff

livepatch: refresh snapd before installing livepatch

4e9a479... by Grant Orndorff

changelog: add cloudinit deadlock avoidance bug

81f02f9... by Grant Orndorff

tests: make it slightly easier to set a custom ppa install source

26ecd2c... by Grant Orndorff

daemon: wait for cloud-config.service to complete in python

When cloud-init gets "ubuntu_advantage" user-data, it may need to
install or upgrade ubuntu-advantage-tools. This happens during
cloud-config.service. The install/upgrade of ubuntu-advantage-tools
triggers a "systemctl start ubuntu-advantage.service".
ubuntu-advantage.service is configured with an
"After=cloud-config.service", so it waits to start until
cloud-config.service becomes "active". In this scenario,
cloud-config.service cannot continue until ubuntu-advantage.service
starts, creating deadlock.

We get around this deadlock by removing the "After=cloud-config.service"
from ubuntu-advantage.service. Instead we are moving the ordering dependency
enforcement into the python code called by the service. This allows
systemd to go ahead and start the service allowing the install of
ubuntu-advantage-tools to finish and cloud-init to continue.
ubuntu-advantage.service will wait until cloud-config.service is
"active" to actually do anything.

LP: #2050022

cc8ee04... by Lucas Albuquerque Medeiros de Moura

logs: fix redaction filter

The redaction filter was not correctly applied to our current logs.
We are now fixing this by adding the redaction filter directly in
the log file handler

5f44b02... by Grant Orndorff

d/rules: fix quotes in echo command