cloud-init: update to 23.4.1

Bumping cloud-init to version 23.4.1, which comprises the following commits:

    2c452ebfb Release 23.4.1
    af28f4bb7 fix: Handle systemctl commands when dbus not ready (#4681)
    6e04a2c54 Release 23.4
    90825eb30 tests: datasourcenone use client.restart to block until done (#4635)
    a84d7884f tests: increase number of retries across reboot to 90 (#4651)
    efb97f45a fix: Add schema for merge types (#4648)
    fe144a58e feat: Allow aliyun ds to fetch data in init-local (#4590)
    30761d528 azure: report failure to eject as error instead of debug (#4643)
    10281c815 bug(schema): write network-config if instance dir present (#4635)
    e4d178f20 test: fix schema fuzzing test (#4639)
    191b5fe88 Update build-on-openbsd dependencies (#4644)
    cd35cadc5 fix(test): Fix expected log for ipv6-only ephemeral network (#4641)
    16ad372ca refactor: Remove metaclass from network_state.py (#4638)
    05f039c9c schema: non-root fallback to default paths on perm errors (# 4631)
    2fb656fd9 fix: Don't loosen the permissions of the log file (#4628)
    86a6973cd Revert "logging: keep current file mode of log file if its stricter than the new mode (#4250)"
    26ad42d22 ephemeral: Handle link up failure for both ipv4 and ipv6  (#4547)
    fddde8124 fix(main): Don't call logging too early (#4595)
    f5b0bad10 fix: Remove Ubuntu-specific kernel naming convention assertion (#4617)
    00b4967a2 fix(log): Do not implement handleError with a self parameter (#4617)
    798f8ee0c fix(log): Don't try to reuse stderr logger (#4617)
    2a815c779 feat: Standardize logging output to stderr (#4617)
    00ec7ab42 chore: Sever unmaintained TODO.rst (#4625)
    ce48aadd6 test: Skip failing tests
    44bf4ce99 distros: Add suse
    074541b41 test: Add default hello package version (#4614)
    ddafa5d83 fix(net): Improve DHCPv4 SUSE code, add test
    7c4d05ab3 net: Fix DHCPv4 not enabled on SUSE in some cases
    424bacc71 fix(schema): Warn if missing dependency (#4616)
    0c9fd4e77 fix(cli): main source cloud_config for schema validation (#4562)
    88ff75795 feat(schema): annotation path for invalid top-level keys (#4562)
    cce2e48d7 feat(schema): top-level additionalProperties: false (#4562)
    498a7bb55 test: ensure top-level properties tests will pass (#4562)
    0449fe249 fix(schema): Add missing schema definitions (#4562)
    e92f3f42d test: Fix snap tests (#4562)
    be8ed188f azure: Check for stale pps data from IMDS (#4596)
    9c6bbc327 test: Undo dhcp6 integration test changes (#4612)
    5496745b3 azure: update diagnostic from warning level to debug
    047d51202 azure/imds: remove limit for connection errors if route present (#4604)
    0b90fbf5b [enhancement]: Add shellcheck to CI (#4488)
    8c275a1f7 chore: add conventional commits template (#4593)
    29ed5f5b6 Revert "net: allow dhcp6 configuration from generate_fallback_configuration()" (#4607)
    745fbf6d1 azure: workaround to disable reporting IMDS failures on Azure Stack
    9def422ee cc_apt_pipelining: Update docs, deprecate options (#4571)
    3f5153871 test: add gh workflows on push to main, update status badges (#4597)
    87b89014e util: Remove function abs_join() (#4587)
    4182851c1 url_helper: Remove unused function retry_on_url_exc() (#4587)
    a11bde5a8 cc_resizefs: Add bcachefs resize support (#4594)
    0cb0b80fa integration_tests: Support non-Ubuntu distros (#4586)
    86d27724a fix(cmdline): fix cmdline parsing with MAC containing cc:
    bf177fa13 azure/errors: include http code in reason for IMDS failure
    ee1e71b77 tests: cloud-init schema --system does not return exit code 2
    37175dd45 github: allow pull request to specify desired rebase and merge
    c756b8eb7 tests: fix integration test expectations of exit 2 on schema warning
    d78ff3780 tests: fix schema test expected cli output Valid schema <type>
    d9436adae fix(schema cli): check raw userdata when processed cloud-config empty
    d1be23b09 azure: report failure to host if ephemeral DHCP secondary NIC (#4558)
    74e3e76ba man: Document cloud-init error codes (#4500)
    70acb7f2a Add support for cloud-init "degraded" state (#4500)
    7f5caeafa status.json: Don't override detail key with error condition (#4500)
    40b54bfef status: Remove duplicated data (#4500)
    fa065e0c7 refactor: Rename exported_errors in status.json (#4500)
    d62c00ebe test: Remove stale status.json value (#4500)
    a6f858b28 tools/render-template: Make yaml loading opt-in, fix setup.py (#4564)
    92fe106eb Add summit digest/trip report to docs (#4561)
    a78e11102 doc: Fix incorrect statement about `cloud-init analyze`
    76972b4a3 azure/imds: ensure new errors are logged immediately when retrying (#4468)
    c1272f324 Clarify boothook docs (#4543)
    1ab5f9baf boothook: allow stdout/stderr to emit to cloud-init-output.log
    7be024562 summit-notes: add 2023 notes for reference in mailinglist/discourse
    5012d77bd fix: added mock to stop leaking journalctl that slows down unit test (#4556)
    99b6f6443 tests: maas test for DataSourceMAASLocal get_data
    7c1f2c26d maas tests: avoid using CiTest case and prefer pytest.tmpdir fixture
    5df30894a MAAS: Add datasource to init-local timeframe
    ff377cfef Ensure all tests passed and/or are skipped
    b2ee332e1 Support QEMU in integration tests
    7f3c2c684 fix(read-dependencies): handle version specifiers containing [~!]
    6326af40d test: unpin pytest
    db0fd2dda schema: network-config optional network key. route uses oneOf (#4482)
    bbd01621d schema: add cloud_init_deepest_matches for best error message (#4482)
    ee86a37fe network: warn invalid cfg add /run/cloud-init/network-config  (#4482)
    ff3beb3fd schema: add network-config support to schema subcommand (#4482)
    40a0120ff Update version number and merge ChangeLog from 23.3.3 into main (#4553)
    afc75849b azure: check for primary interface when performing DHCP (#4465)
    14b76c444 Fix hypothesis failure
    9a401b4a2 subp: add a log when skipping a file for execution for lack of exe permission (#4506)
    7377c7774 azure/imds: refactor max_connection_errors definition (#4467)
    c541a3aea chore: fix PR template rendering (#4526)
    2ab1f3404 fix(cc_apt_configure): avoid unneeded call to apt-install (#4519)
    b2f8683c0 comment difference between sysconfig and NetworkManager renderer (#4517)
    8114ce21c Set Debian's default locale to be c.UTF-8 (#4503)
    422018c94 Convert test_debian.py to pytest (#4503)
    4edc5c357 doc: fix cloudstack link
    b73950eda doc: fix development/contributing.html references
    e6f3484b9 doc: hide duplicated links
    d0f00bd54 Revert "ds-identify/CloudStack: $DS_MAYBE if vm running on vmware/xen (#4281)" (#4511)
    2cf2aa20d Fix the missing mcopy argument
    c84369ac4 tests: Add logging fix (#4499)
    a0f53bd12 Update upgrade test to account for dhcp6
    0cf010e6c Remove logging of PPID path (#4502)
    928b7e37f Make Python 3.12 CI test non-experimental (#4498)
    de5fc365f ds-identify: exit 2 on disabled state from marker or cmdline (#4399)
    2ba7946eb cloud-init-generator: Various performance optimizations (#4399)
    ec7dde804 systemd: Standardize cloud-init systemd enablement (#4399)
    5368ef3f8 benchmark: benchmark cloud-init-generator independent of ds-identify (#4399)
    c5cd17d71 tests/integration_tests: add cloud-init disablement coverage (#4399)
    2244a9838 doc: Describe disabling cloud-init using an environment variable (#4399)
    36b7f48d7 fix: cloud-init status --wait broken with KERNEL_CMDLINE (#4399)
    d113ed6ef azure/imds: retry on 429 errors for reprovisiondata (#4470)
    f780cf9ca cmd: Don't write json status files for non-boot stages (#4478)
    9fde06955 ds-identify: Allow disable service and override environment (#4485)
    3267098e8 Update DataSourceNWCS.py (#4496)
    5c46995b7 Add r00ta to CLA signers file
    b1e659c74 Fix override of systemd_locale_conf in rhel
    46fb87ec8 ci(linkcheck): minor fixes (#4495)
    4dcd72a8d integration test fix for deb822 URI format (#4492)
    33d1f0a1a test: use a mantic-compatible tz in t/i/m/test_combined.py (#4494)
    abbcfc00f ua: shift CLI command from ua to pro for all interactions
    5f57c861b pro: avoid double-dash when enabling inviddual services on CLI
    518047aea net: allow dhcp6 configuration from generate_fallback_configuration() (#4474)
    2a730844e tests: apt re.search to match alternative ordering of installed pkgs
    527839d46 apt: doc apt_pkg performance improvement over subp apt-config dump
    271ec8b3e Tidy up contributing docs (#4469)
    3d629fc92 [enhancement]: Automatically linkcheck in CI (#4479)
    6ed6b69ee Revert allowing pro service warnings (#4483)
    d0312faa9 Export warning logs to status.json (#4455)
    376af8e3e Fix regression in package installation (#4466)
    893b89a97 schema: cloud-init schema in early boot or in dev environ (#4448)
    4bea707dd schema: annotation of nested dicts lists in schema marks (#4448)
    506e70fa1 feat(apport): collect ubuntu-pro logs if ubuntu-advantage.log present (#4443)
    494bb1ae8 apt_configure: add deb822 support for default sources file (#4437)
    d9cdc2980 net: remove the word "on instance boot" from cloud-init generated config (#4457)
    c1f6f59e9 style: Make cloudinit.log functions use snake case (#4449)
    ae9f3bf83 Don't recommend using cloud-init as a library (#4459)
    3a031a75e vmware: Fall back to vmtoolsd if vmware-rpctool errs (#4444)
    dfe6170c2 azure: add option to enable/disable secondary ip config (#4432)
    226ba2582 Allow installing snaps via package_update_upgrade_install module (#4202)
    55c13f5cf docs: Add cloud-init overview/introduction (#4440)
    015543d30 apt: install software-properties-common when absent but needed (#4441)
    d18c9cc0b sources/Azure: Ignore system volume information folder while scanning for files in the ntfs resource disk (#4446)
    a3b9a1eff refactor: Remove unnecessary __main__.py file
    e8ea89de8 style: Drop vi format comments
    107aa74ac cloudinit.log: Use more appropriate exception (#4435)
    de472d050 cloudinit.log: Don't configure NullHandler (#4435)
    6bbbfbbb0 Simplify root logger configuration (#4435)
    b0326156b cloudinit.log: Remove unnecessary module function and variables (#4435)
    40bfa351c cloudinit.log: Remove unused getLogger wrapper (#4435)
    0044c8351 cloudinit.log: Standardize use of cloudinit's logging module (#4435)
    461f2610d Remove unnecessary logging wrapper in Cloud class (#4435)
    67bb6aa31 integration test: allow pro service warnings (#4447)
    5be5f587b integration tests: fix mount indentation (#4445)
    86185638c sources/Azure: fix for conflicting reports to platform (#4434)
    e9224e578 docs: link the cloud-config validation service (#4442)
    13938f749 Fix pip-managed ansible on pip < 23.0.1 (#4403)
    e9cdd7e39 Install gnupg if gpg not found (#4431)
    97e09dfea Add "phsm" as contributor (#4429)
    349ca1e10 cc_ubuntu_advantage: do not rely on uaclient.messages module (#4397)
    461e08049 tools/ds-identify: match Azure datasource's ds_detect() behavior (#4430)
    5023e9f9c Refactor test_apt_source_v1.py to use pytest (#4427)
    76b7b3814 sources: do not override datasource detection if None is in list (#4426)
    be7f64d76 feat: check for create_hostname_file key before writing /etc/hostname (SC-1588) (#4330)
    0d9f149a3 Pytestify apt config test modules (#4424)
    efcd006b5 upstream gentoo patch (#4422)
    937e84c4d Work around no instance ip (#4419)
    436e6717b Fix typing issues in subp module (#4401)
    fd214a124 net: fix ipv6_dhcpv6_stateful/stateless/slaac configuration for rhel (#4395)
    80e460835 Release 23.3.1
    f6bb55302 apt: kill dirmngr/gpg-agent without gpgconf dependency
    b79dacd8f integration tests: fix mount indentation (#4405)
    816e05d48 Use grep for faster parsing of cloud config in ds-identify (#4327)
    b826731ba doc: fix instructions on how to disable cloud-init from kernel command line (#4406)
    dec3b65e4 doc/vmware: Update contents relevant to disable_vmware_customization
    40c9fe4f6 Bring back flake8 for python 3.6 (#4394)
    60b50dd4f integration tests: Fix cgroup parsing (#4402)
    10ce8ad56 summary: Update template parameter descriptions in docs
    dc7c48b9b Log PPID for better debugging (#4398)
    8761fe8c5 integration tests: don't clean when KEEP_* flags true (#4400)
    06a678856 clean: add a new option to clean generated config files
    72949eede pep-594: drop deprecated pipes module import
    3b5883575 Release 23.3 (#4388)
    ac3c9d7c8 Bump pycloudlib to 1!5.1.0 for ec2 mantic daily image support (#4390)
    b06f6f5fb Fix cc_keyboard in mantic
    980f69003 ec2: initialize get_instance_userdata return value to bytes (#4387)
    b05517fbc cc_users_groups: Add doas/opendoas support (#4363)
    b417b2181 Fix pip-managed ansible
    f7a2c48f2 status: treat SubState=running and MainPID=0 as service exited
    b669f31c3 azure/imds: increase read-timeout to 30s (#4372)
    9436569e2 collect-logs fix memory usage (SC-1590) (#4289)
    327759039 cc_mounts: Use fallocate to create swapfile on btrfs (#4369)
    3473bba3f Undocument nocloud-net (#4318)
    440465a38 feat(akamai): add akamai to settings.py and apport.py (#4370)
    7263cb489 read-version: fallback to get_version when git describe fails (#4366)
    842d04524 apt: fix cloud-init status --wait blocking on systemd v 253 (#4364)
    f69a6f3b3 integration tests: Pass username to pycloudlib (#4324)
    90b015972 Bump pycloudlib to 1!5.1.0 (#4353)
    cda82fe4c cloud.cfg.tmpl: reorganise, minimise/reduce duplication (#4272)
    4f09548b4 analyze: fix (unexpected) timestamp parsing (#4347)
    1e1624ff8 cc_growpart: fix tests to run on FreeBSD (#4351)
    0c17a341b subp: Fix spurious test failure on FreeBSD (#4355)
    10d6f303b cmd/clean: fix tests on non-Linux platforms (#4352)
    8a70dbc49 util: Fix get_proc_ppid() on non-Linux systems (#4348)
    0cfc5c613 cc_wireguard: make tests pass on FreeBSD (#4346)
    37c2a66be unittests: fix breakage in test_read_cfg_paths_fetches_cached_datasource (#4328)
    b90a0a8e8 Fix test_tools.py collection (#4315)
    8d9da9024 cc_keyboard: add Alpine support (#4278)
    b1f4a27b7 Flake8 fixes (#4340)
    11a4fd1f8 cc_mounts: Fix swapfile not working on btrfs (#4319)
    7949bb3de ds-identify/CloudStack: $DS_MAYBE if vm running on vmware/xen (#4281)
    658837389 ec2: Support double encoded userdata (#4276)
    9cc3b8f54 cc_mounts: xfs is a Linux only FS (#4334)
    4a37eaaa5 tests/net: fix TestGetInterfaces' mock coverage for get_master (#4336)
    441d8f818 change openEuler to openeuler and fix some bugs in openEuler (#4317)
    e2ae75542 Replace flake8 with ruff (#4314)
    d41264cb4 NM renderer: set default IPv6 addr-gen-mode for all interfaces to eui64 (#4291)
    9fdc7a9cd cc_ssh_import_id: add Alpine support and add doas support (#4277)
    7cbe0f647 Release 23.2.2 (#4300)
    4b342918b sudoers not idempotent (SC-1589)  (#4296)
    02c826a9e Added support for Akamai Connected Cloud (formerly Linode) (#4167)
    a31370afe Fix reference before assignment (#4292)
    ee9078a77 Overhaul module reference page (#4237)
    a608fbc81 replaced spaces with commas for setting passenv (#4269)
    4a6a9d3f6 DS VMware: modify a few log level (#4284)
    1f1ca55c0 tools/read-version refactors and unit tests (#4268)
    5509b7900 Ensure get_features() grabs all features (#4285)
    5ed70cc09 Don't always require passlib dependency (#4274)
    297d1719a tests: avoid leaks into host system checking of ovs-vsctl cmd (#4275)
    fda2ec6f5 Fix NoCloud kernel commandline key parsing (#4273)
    86c700713 testing: Clear all LRU caches after each test (#4249)
    f755bad5d Remove the crypt dependency (#2139)
    a0e4ec15a logging: keep current file mode of log file if its stricter than the new mode (#4250)
    9d815c6f5 Remove default membership in redundant groups (#4258)
    d409e80b7 doc: improve datasource_creation.rst (#4262)
    392346ccd Remove duplicate Integration testing button (#4261)
    6543c88e0 tools/read-version: fix the tool so that it can handle version parsing errors (#4234)
    ce7d597a6 net/dhcp: add udhcpc support (#4190)
    862a6e0ec DS VMware: add i386 arch dir to deployPkg plugin search path
    7d82c481a LXD moved from linuxcontainers.org to Canonical
    ebd7b2b69 cc_mounts.py: Add note about issue with creating mounts inside mounts (#4232)
    c38337ec5 lxd: install lxd from snap, not deb if absent in image
    b88e09704 landscape: use landscape-config to write configuration
    1c9b1f314 Add deprecation log during init of DataSourceDigitalOcean (#4194)
    e2adc9725 doc: fix typo on apt.primary.arches (#4238)
    cf474da7f Inspect systemd state for cloud-init status (#4230)
    7f933d4d0 instance-data: add system-info and features to combined-cloud-config (#4224)
    b3c9b6a79 systemd: Block login until config stage completes (#2111)
    7b46837ef tests: proposed should invoke apt-get install -t=<release>-proposed (#4235)
    66a70c5ea cloud.cfg.tmpl: reinstate ca_certs entry (#4236)
    e2a7178a5 Remove feature flag override ability (#4228)
    317a0232a tests: drop stray unrelated file presence test (#4227)
    7f1d841bf Update LXD URL (#4223)
    39b6aa774 schema: add network v1 schema definition and validation functions
    3a320b439 tests: daily PPA for devel series is version 99.daily update tests to match (#4225)
    59fd01d68 instance-data: write /run/cloud-init/combined-cloud-config.json
    e371d63e0 mount parse: Fix matching non-existent directories (#4222)
    8836c7824 Specify build-system for pep517 (#4218)
    c68305a91 Fix network v2 metric rendering (#4220)
    5674a7dc8 Migrate content out of FAQ page (SD-1187) (#4205)
    c70ea0178 setup: fix generation of init templates (#4209)
    cce37f69f docs: Correct some bootcmd example wording
    16b7097e6 fix changelog
    e5a617fea Release 23.2.1 (#4207)
    2125cc758 tests: reboot client to assert x-shellscript-per-boot is triggered
    0e374f83a nocloud: parse_cmdline no longer detects nocloud-net datasource (#4204)
    d8960054b Add docstring and typing to mergemanydict (#4200)
    529e108ca BSD: add dsidentify to early startup scripts (#4182)
    e6c069d47 handler: report errors on skipped merged cloud-config.txt parts
    4538a2ec4 Add cloud-init summit writeups (#4179)
    5267ebbf3 tests: Update test_clean_log for oci (#4187)
    df2a053be gce: improve ephemeral fallback NIC selection (CPC-2578) (#4163)
    d1268cdf6 tests: pin pytest 7.3.1 to avoid adverse testpaths behavior (#4184)
    06a147577 Ephemeral Networking for FreeBSD (#2165)
    8615c240c Clarify directory syntax for nocloud local filesystem. (#4178)
    a1f375095 Set default renderer as sysconfig for centos/rhel (#4165)
    ae43cc883 Test static routes and netplan 0.106
    98fd7fb74 FreeBSD fix parsing of mount and mount options (#2146)
    25f4c85cd test: add tracking bug id (#4164)
    57d29d046 tests: can't match MAC for LXD container veth due to netplan 0.106 (#4162)
    4014f82e1 Add kaiwalyakoparkar as a contributor (#4156)
    3d0ad7c35 BSD: remove datasource_list from cloud.cfg template (#4159)
    51431af3d launching salt-minion in masterless mode (#4110)
    ee1e7b3d2 tools: fix run-container builds for rockylinux/8 git hash mismatch (#4161)
    32e61372c fix doc lint: spellchecker tripped up (#4160)
    95364bbf7 Support Ephemeral Networking for BSD (#2127)
    78650806d Added / fixed support for static routes on OpenBSD and FreeBSD (#2157)
    71d667c5f cc_rsyslog: Refactor for better multi-platform support (#4119)
    afdba1e1b tests: fix test_lp1835584 (#4154)
    d8cc29885 cloud.cfg mod names: docs and rename salt_minion and set_password (#4153)
    84d9a83ae tests: apt support for deb822 format .sources files on mantic
    4f0f4396a vultr: remove check_route check (#2151)
    321fe7b2d Update SECURITY.md (#4150)
    9689e3d44 Update CONTRIBUTING.rst (#4149)
    5da6d7bd0 Update .github-cla-signers (#4151)
    e0a96d78c Standardise module names in cloud.cfg.tmpl to only use underscore (#4128)
    29a4edbdc tests: update test_webhook_reporting
    f109955bf Modify PR template so autoclose works
    dd24c21eb doc: add missing semi-colon to nocloud cmdline docs (#4120)
    d48530ed3 .gitignore: extend coverage pattern (#4143)

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch b/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch
index cc2914c9..e5b214fe 100644
--- a/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch
+++ b/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch
@@ -22,11 +22,11 @@ Index: git/setup.py
 ===================================================================
 --- git.orig/setup.py
 +++ git/setup.py
-@@ -98,7 +98,7 @@
+@@ -60,7 +60,7 @@
      that files are different outside of the debian directory."""
  
      # newer versions just use install.
--    if not (sys.argv[1] == "install"):
+-    if "install" not in sys.argv:
 +    if not ('install' in sys.argv or sys.argv[1].startswith('bdist*')):
          return template
  
diff --git a/recipes-extended/cloud-init/cloud-init_git.bb b/recipes-extended/cloud-init/cloud-init_git.bb
index edc6372f..390797b7 100644
--- a/recipes-extended/cloud-init/cloud-init_git.bb
+++ b/recipes-extended/cloud-init/cloud-init_git.bb
@@ -7,13 +7,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c6dd79b6ec2130a3364f6fa9d6380408 \
     file://LICENSE-Apache2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \
 "
 
-SRCREV = "293c6546f038ef4da98910dfeb8d0ade65707952"
-SRC_URI = "git://github.com/canonical/cloud-init;branch=23.2.x;protocol=https \
+SRCREV = "2c452ebfb86d2007d81dcbd986adf1e4cdc6a7f3"
+SRC_URI = "git://github.com/canonical/cloud-init;branch=23.4.x;protocol=https \
     file://cloud-init-source-local-lsb-functions.patch \
     file://0001-setup.py-check-for-install-anywhere-in-args.patch \
 "
 
-PV = "v23.2.2+git"
+PV = "v23.4.1+git"
 
 S = "${WORKDIR}/git"