cloud-init: update to 21.4

Bumping cloud-init to version 21.4-47-ga97fd062

 - patch refresh
 - add bash to RDPENDS

Commit summary:

    a97fd062 Add .git-blame-ignore-revs (#1161)
    bae9b11d Adopt Black and isort (SC-700) (#1157)
    2bcf4fa9 Include dpkg frontend lock in APT_LOCK_FILES (#1153)
    3da3bdae tests/cmd/query: fix test run as root and add coverage for defaults (#1156)
    9a6e65a2 Schema processing changes (SC-676) (#1144)
    35711700 Add dependency workaround for impish in bddeb (#1148)
    3303b704 netbsd: install new dep packages (#1151)
    f4692c5d find_devs_with_openbsd: ensure we return the last entry (#1149)
    e9634266 sources/azure: remove unnecessary hostname bounce (#1143)
    24739592 find_devs/openbsd: accept ISO on disk (#1132)
    b591e9db Improve error log message when mount failed (#1140)
    8df8f43a add KsenijaS as a contributor (#1145)
    6760bf14 travis - don't run integration tests if no deb (#1139)
    65c2cfd7 factor out function for getting top level directory of cloudinit (#1136)
    b21afb0a testing: Add deterministic test id (#1138)
    2969ceaa mock sleep() in azure test (#1137)
    0ed00ad9 Add miraclelinux support (#1128)
    cd40789a docs: Make MACs lowercase in network config (#1135)
    bedac77e Add Strict Metaschema Validation (#1101)
    f428ed16 update dead link (#1133)
    0e25076b cloudinit/net: handle two different routes for the same ip (#1124)
    6e39613d docs: pin mistune dependency (#1134)
    039c40f9 Reorganize unit test locations under tests/unittests (#1126)
    ffa6fc88 Fix exception when no activator found (#1129)
    0fe96a44 jinja: provide and document jinja-safe key aliases in instance-data (SC-622) (#1123)
    ff10fc09 testing: Remove date from final_message test (SC-638) (#1127)
    cf38c2cb Move GCE metadata fetch to init-local (SC-502) (#1122)
    a1cf55e5 Fix missing metadata routes for vultr (#1125)
    c39d4f45 cc_ssh_authkey_fingerprints.py: prevent duplicate messages on console (#1081)
    4bf4de25 sources/azure: remove unused remnants related to agent command (#1119)
    32860627 github: update PR template's contributing URL (#1120)
    b36b4e2f docs: Rename HACKING.rst to CONTRIBUTING.rst (#1118)
    31daf667 testing: monkeypatch system_info call in unit tests (SC-533) (#1117)
    1343584d Fix Vultr timeout and wait values (#1113)
    7ebf04e3 lxd: add preference for LXD cloud-init.* config keys over user keys (#1108)
    3c6b594b VMware: source /etc/network/interfaces.d/* on Debian
    62721ae7 Add cjp256 as contributor (#1109)
    36adb6da integration_tests: Ensure log directory exists before symlinking to it (#1110)
    7f03da35 testing: add growpart integration test (#1104)
    8c52bb3f integration_test: Speed up CI run time (#1111)
    f0af9f78 Some miscellaneous integration test fixes (SC-606) (#1103)
    918d69a0 tests: specialize lxd_discovery test for lxd_vm vendordata (#1106)
    22150a20 Add convenience symlink to integration test output (#1105)
    fff6de4a Fix for set-name bug in networkd renderer (#1100)
    3d150688 Wait for apt lock (#1034)
    6421a202 testing: stop chef test from running on openstack (#1102)
    820e3d1c alpine.py: add options to the apk upgrade command (#1089)
    db6084bd Release 21.4 (#1091)
    ff415cad Azure: fallback nic needs to be reevaluated during reprovisioning (#1094)
    48467aa3 azure: pps imds (#1093)
    d54e23bf testing: Remove calls to 'install_new_cloud_init' (#1092)
    77376534 Add LXD datasource (#1040)
    b1beb538 Fix unhandled apt_configure case. (#1065)
    a90d8338 Allow libexec for hotplug (#1088)
    0f8428f6 Add necessary mocks to test_ovf unit tests (#1087)
    28581988 Remove (deprecated) apt-key (#1068)
    d4fe4bf5 distros: Remove a completed "TODO" comment (#1086)
    d77d6bf1 cc_ssh.py: Add configuration for controlling ssh-keygen output (#1083)
    1d01da5d Add "install hotplug" module (SC-476) (#1069)
    75b26b0a hosts.alpine.tmpl: rearrange the order of short and long hostnames (#1084)
    994339ae Add max version to docutils
    e6f15ae5 cloudinit/dmi.py: Change warning to debug to prevent console display (#1082)
    a8380a12 remove unnecessary EOF string in disable-sshd-keygen-if-cloud-init-active.conf (#1075)
    a4236c37 Add module 'write-files-deferred' executed in stage 'final' (#916)
    81f6aa16 Bump pycloudlib to fix CI (#1080)
    2db71334 Remove pin in dependencies for jsonschema (#1078)
    6cf9dc87 Add "Google" as possible system-product-name (#1077)
    2107ad01 Update Debian security suite for bullseye (#1076)
    8c89009e Leave the details of service management to the distro (#1074)
    3a6bee59 Fix typos in setup.py (#1059)
    150fd30e Update Azure _unpickle (SC-500) (#1067)
    ee296ced cc_ssh.py: fix private key group owner and permissions (#1070)
    a0a68a24 VMware: read network-config from ISO (#1066)
    70f0ee78 testing: mock sleep in gce unit tests (#1072)
    62c2a56e CloudStack: fix data-server DNS resolution (#1004)
    125dcb28 Fix unit test broken by pyyaml upgrade (#1071)
    a9501251 testing: add get_cloud function (SC-461) (#1038)
    b3e31ba2 Inhibit sshd-keygen@.service if cloud-init is active (#1028)
    76166caf VMWARE: search the deployPkg plugin in multiarch dir (#1061)
    ca0da042 Fix set-name/interface DNS bug (#1058)
    1ee2f3c3 Use specified tmp location for growpart (#1046)
    048a825c .gitignore: ignore tags file for ctags users (#1057)
    725a7f7f Allow comments in runcmd and report failed commands correctly (#1049)
    fd595774 tox integration: pass the *_proxy, GOOGLE_*, GCP_* env vars (#1050)
    9c147e83 Allow disabling of network activation (SC-307) (#1048)
    3d2bac8b renderer: convert relative imports to absolute (#1052)
    1bbb67ca Support ETHx_IP6_GATEWAY, SET_HOSTNAME on OpenNebula (#1045)
    de166ec3 integration-requirements: bump the pycloudlib commit (#1047)
    81a8f0a6 lp-to-git-users: adding vholer (#1044)
    591e97da Allow Vultr to set MTU and use as-is configs (#1037)
    392c3262 pin jsonschema in requirements.txt (#1043)
    ba083245 testing: remove cloud_tests (#1020)
    934c8d71 Add andgein as contributor (#1042)
    82d6f564 Make wording for module frequency consistent (#1039)
    2d67c1b9 Use ascii code for growpart (#1036)
    21aec00f Add jshen28 as contributor (#1035)
    c29c5b1d Skip test_cache_purged_on_version_change on Azure (#1033)
    8cebc449 Remove invalid ssh_import_id from examples (#1031)
    244af3f4 Cleanup Vultr support (#987)
    24a15e9c docs: update cc_disk_setup for fs to raw disk (#1017)
    a1e78b2e HACKING.rst: change contact info to James Falcon (#1030)
    089a307d tox: bump the pinned flake8 and pylint version (#1029)
    e27c3074 Add retries to DataSourceGCE.py when connecting to GCE (#1005)
    dc227869 Set Azure to apply networking config every BOOT (#1023)
    612e3908 Add connectivity_url to Oracle's EphemeralDHCPv4 (#988)
    cb82a450 docs: fix typo and include sudo for report bugs commands (#1022)
    5ea2c669 VMware: Fix typo introduced in #947 and add test (#1019)
    d4fe7bc4 Update IPv6 entries in /etc/hosts (#1021)
    023f97d4 Integration test upgrades for the 21.3-1 SRU (#1001)
    26a92b0d Add Jille to tools/.github-cla-signers (#1016)
    f3cc9494 Improve ug_util.py (#1013)
    f4c47e3e Support openEuler OS (#1012)
    2ce85724 ssh_utils.py: ignore when sshd_config options are not key/value pairs (#1007)
    e69a8874 Set Azure to only update metadata on BOOT_NEW_INSTANCE (#1006)
    7fe0f900 cc_update_etc_hosts: Use the distribution-defined path for the hosts file (#983)
    f6c71fd7 Add CloudLinux OS support (#1003)
    db72c841 puppet config: add the start_agent option (#1002)
    58c2de4c Fix `make style-check` errors (#1000)
    76cff793 Make cloud-id copyright year (#991)
    7fc3f08e Add support to accept-ra in networkd renderer (#999)
    de8931ed Update ds-identify to pass shellcheck (#979)
    28e56d99 Azure: Retry dhcp on timeouts when polling reprovisiondata (#998)
    6803368d testing: Fix ssh keys integration test (#992)
    03ee10cd Release 21.3 (#993)
    3ec8ddde Azure: During primary nic detection, check interface status continuously before rebinding again (#990)
    7d3f5d75 Fix home permissions modified by ssh module (SC-338) (#984)
    94679e17 Add integration test for sensitive jinja substitution (#986)
    776bd363 Ignore hotplug socket when collecting logs (#985)
    3e63025a testing: Add missing mocks to test_vmware.py (#982)
    0bf8d575 add Zadara Edge Cloud Platform to the supported clouds list (#963)
    b9c96b4f testing: skip upgrade tests on LXD VMs (#980)
    65607405 Only invoke hotplug socket when functionality is enabled (#952)
    f516a7d3 Revert unnecesary lcase in ds-identify (#978)
    04047438 cc_resolv_conf: fix typos (#969)
    1c3b10b5 Replace broken httpretty tests with mock (SC-324) (#973)
    e119cece Azure: Check if interface is up after sleep when trying to bring it up (#972)
    7781dec3 Update dscheck_VMware's rpctool check (#970)
    82a30e6d Azure: Logging the detected interfaces (#968)
    b9d308b4 Change netifaces dependency to 0.10.4 (#965)
    d3271217 Azure: Limit polling network metadata on connection errors (#961)
    c62cb3af Update inconsistent indentation (#962)
    9893dfcd cc_puppet: support AIO installations and more (#960)
    3c858591 Add Puppet contributors to CLA signers (#964)
    8b4a9bc7 Datasource for VMware (#953)
    049d62b6 photon: refactor hostname handling and add networkd activator (#958)
    00dbaf1e Stop copying ssh system keys and check folder permissions (#956)
    13b6a857 testing: port remaining cloud tests to integration testing framework (SC-191) (#955)
    8f42eb54 generate contents for ovf-env.xml when provisioning via IMDS (#959)
    3d9c862b Add support for EuroLinux 7 && EuroLinux 8 (#957)
    758acf97 Implementing device_aliases as described in docs (#945)
    824977bd testing: fix test_ssh_import_id.py (#954)
    6e7066ea Add ability to manage fallback network config on PhotonOS (#941)
    4257e30a Add VZLinux support (#951)
    f0ab1e64 VMware: add network-config support in ovf-env.xml (#947)
    ec6afadb Update pylint to v2.9.3 and fix the new issues it spots (#946)
    a984ee78 Azure: mount default provisioning iso before try device listing (#870)
    4fbe192a Document known hotplug limitations (#950)
    184c836a Initial hotplug support (#936)
    eacb0353 Fix MIME policy failure on python version upgrade (#934)
    881be6e7 run-container: fixup the centos repos baseurls when using http_proxy (#944)
    a185f319 tools: add support for building rpms on rocky linux (#940)
    9b52405c ssh-util: allow cloudinit to merge all ssh keys into a custom user file, defined in AuthorizedKeysFile (#937)
    108611ae VMware: new "allow_raw_data" switch (#939)
    7f5e6822 bump pycloudlib version (#935)
    894dd7c4 add renanrodrigo as a contributor (#938)
    36aeb49c testing: simplify test_upgrade.py (#932)
    db51b656 freebsd/net_v1 format: read MTU from root (#930)
    81299de5 Add new network activators to bring up interfaces (#919)
    78e89b03 - Detect a Python version change and clear the cache (#857)
    6e0aa175 cloud_tests: fix the Impish release name (#931)
    b5aecbe9 Removed distro specific network code from Photon (#929)
    35aa9db6 Add support for VMware PhotonOS (#909)
    f5a24496 cloud_tests: add impish release definition (#927)
    db23b1b1 docs: fix stale links rename master branch to main (#926)
    abd2da57 Fix DNS in NetworkState (SC-133) (#923)
    fbcb224b tests: Add 'adhoc' mark for integration tests (#925)
    1243c5a1 Fix the spelling of "DigitalOcean" (#924)
    c8d3f99b Small Doc Update for ReportEventStack and Test (#920)
    950c186a Replace deprecated collections.Iterable with abc replacement (#922)
    59a3d845 testing: OCI availability domain is now required (SC-59) (#910)
    59a848c5 add DragonFlyBSD support (#904)
    05b0e350 Use instance-data-sensitive.json in jinja templates (SC-117) (#917)
    b11632d1 doc: Update NoCloud docs stating required files (#918)
    9c400e46 build-on-netbsd: don't pin a specific py3 version (#913)
    29ac50f2 - Create the log file with 640 permissions (#858)
    503e2d39 Allow braces to appear in dhclient output (#911)
    63f72380 Docs: Replace all freenode references with libera (#912)
    fc161f8e openbsd/net: flush the route table on net restart (#908)
    7c1d27b8 Add Rocky Linux support to cloud-init (#906)
    c8db6032 Add "esposem" as contributor (#907)
    3611befb Add integration test for #868 (#901)
    1793b8b7 Added support for importing keys via primary/security mirror clauses (#882)
    21a0b120 [examples] config-user-groups expire in the future (#902)
    6fe19837 BSD: static network, set the mtu (#894)
    4c3c3629 Add integration test for lp-1920939 (#891)
    57964125 Fix unit tests breaking from new httpretty version (#903)
    86434699 Allow user control over update events (#834)
    899bfaa9 Update test characters in substitution unit test (#893)
    77320bfc cc_disk_setup.py: remove UDEVADM_CMD definition as not used (#886)
    8cf40a73 Add AlmaLinux OS support (#872)
    13877549 Release 21.2 (#890)
    f17f78fa Add \r\n check for SSH keys in Azure (#889)
    5f5fa5ee Revert "Add support to resize rootfs if using LVM (#721)" (#887)
    9ea643ff Add Vultaire as contributor (#881)
    ba82b3ef Azure: adding support for consuming userdata from IMDS (#884)
    5c740dcf test_upgrade: modify test_upgrade_package to run for more sources (#883)
    02db2c3e Fix chef module run failure when chef_license is set (#868)
    b2311664 Azure: Retry net metadata during nic attach for non-timeout errs (#878)
    431b3683 Azure: Retrieve username and hostname from IMDS (#865)
    d5cca27a Azure: eject the provisioning iso before reporting ready (#861)
    ced836e6 Use `partprobe` to re-read partition table if available (#856)
    d132356c fix error on upgrade caused by new vendordata2 attributes (#869)
    45db197c add prefer_fqdn_over_hostname config option (#859)
    0d90596b Emit dots on travis to avoid timeout (#867)
    cc16c922 doc: Replace remaining references to user-scripts as a config module (#866)
    9f9e154f azure: Removing ability to invoke walinuxagent (#799)
    0ae0b1d4 Add Vultr support (#827)
    83f6bbfb Fix unpickle for source paths missing run_dir (#863)
    fb38aa59 sysconfig: use BONDING_MODULE_OPTS on SUSE (#831)
    a9d3664c lp-to-git-users: adding B1Sandmann (#828)
    15dd3601 bringup_static_routes: fix gateway check (#850)
    fc5d5415 add hamalq user (#860)
    74fa008b Add support to resize rootfs if using LVM (#721)
    3b7e2e82 Fix mis-detecting network configuration in initramfs cmdline (#844)
    13606a12 tools/write-ssh-key-fingerprints: do not display empty header/footer (#817)
    6ae1145f Azure helper: Ensure Azure http handler sleeps between retries (#842)
    d4acc092 Fix chef apt source example (#826)
    bad84ad4 .travis.yml: generate an SSH key before running tests (#848)
    b794d426 write passwords only to serial console, lock down cloud-init-output.log (#847)
    c6726c2b Fix apt default integration test (#845)
    dae45c3b integration_tests: bump pycloudlib dependency (#846)
    f35181fa Fix stack trace if vendordata_raw contained an array (#837)
    3aeb14cd archlinux: Fix broken locale logic (#841)
    d95b448f Integration test for #783 (#832)
    74e1e50d integration_tests: mount more paths IN_PLACE (#838)
    9bd19645 Fix requiring device-number on EC2 derivatives (#836)
    6fe99157 Remove the vi comment from the part-handler example (#835)
    121bc04c net: exclude OVS internal interfaces in get_interfaces (#829)
    106c57d5 tox.ini: pass OS_* environment variables to integration tests (#830)
    3dd3de7c integration_tests: add OpenStack as a platform (#804)
    3be66630 Add flexibility to IMDS api-version (#793)
    62f7a8b1 Fix the TestApt tests using apt-key on Xenial and Hirsute (#823)
    a10838a6 doc: remove duplicate "it" from nocloud.rst (#825)
    2757333e archlinux: Use hostnamectl to set the transient hostname (#797)
    402d98ed cc_keys_to_console.py: Add documentation for recently added config key (#824)
    695c4f8f Update cc_set_hostname documentation (#818)
    d873b9dc Release 21.1 (#820)
    a64b7380 Azure: Support for VMs without ephemeral resource disks. (#800)
    e384a543 cc_keys_to_console: add option to disable key emission (#811)
    38aee6ee integration_tests: introduce lxd_use_exec mark (#802)
    66e2d42d azure: case-insensitive UUID to avoid new IID during kernel upgrade (#798)
    08d8902a stale.yml: don't ask submitters to reopen PRs (#816)
    33b6cf29 integration_tests: fix use of SSH agent within tox (#815)
    28d2d4b8 integration_tests: add UPGRADE CloudInitSource (#812)
    5a9008e5 integration_tests: use unique MAC addresses for tests (#813)
    6056ccd4 Update .gitignore (#814)
    7f1cefe9 Port apt cloud_tests to integration tests (#808)
    85e88af0 integration_tests: fix test_gh626 on LXD VMs (#809)
    84e56f84 Fix attempting to decode binary data in test_seed_random_data test (#806)
    09193e51 Remove wait argument from tests with session_cloud calls (#805)
    0497c7b1 Datasource for UpCloud (#743)
    3a0a5894 test_gh668: fix failure on LXD VMs (#801)
    3cebe0df openstack: read the dynamic metadata group vendor_data2.json (#777)
    36ddf1eb includedir in suoders can be prefixed by "arroba" (#783)
    6efe16d8 [VMware] change default max wait time to 15s (#774)
    e7e7b429 Revert integration test associated with reverted #586 (#784)
    5ccc8cba Add jordimassaguerpla as contributor (#787)
    a0fdd856 Add Rick Harding to CLA signers (#792)
    c343e8b3 HACKING.rst: add clarifying note to LP CLA process section (#789)
    5ec01a57 Stop linting cloud_tests (#791)
    4c190685 cloud-tests: update cryptography requirement (#790)
    a9c904dc Remove 'remove-raise-on-failure' calls from integration_tests (#788)
    1527efa7 Use more cloud defaults in integration tests (#757)
    2d0b6368 Adding self to cla signers (#776)
    e051d542 doc: avoid two warnings (#781)
    b3abcdc0 Use proper spelling for Red Hat (#778)
    ad23441d Add antonyc to .github-cla-signers (#747)
    c25118ac integration_tests: log image serial if available (#772)
    cdc5b81f Revert "ssh_util: handle non-default AuthorizedKeysFile config (#586)" (#775)
    9db8620b Release 20.4.1
    6fc9da99 Revert "ssh_util: handle non-default AuthorizedKeysFile config (#586)"
    11630044 [VMware] Support cloudinit raw data feature (#691)
    9a258eeb net: Fix static routes to host in eni renderer (#668)
    162fb839 .travis.yml: don't run cloud_tests in CI (#756)
    7b58982a test_upgrade: add some missing commas (#769)
    37abbc43 cc_seed_random: update documentation and fix integration test (#771)
    503435d1 Fix test gh-632 test to only run on NoCloud (#770)
    2b2c7f39 archlinux: fix package upgrade command handling (#768)
    2bfa461b integration_tests: add integration test for LP: #1910835 (#761)
    4f62ae8d Fix regression with handling of IMDS ssh keys (#760)
    88581e54 integration_tests: log cloud-init version in SUT (#758)
    83ba4d18 Add ajmyyra as contributor (#742)
    75eb007f net_convert: add some missing help text (#755)
    ea6fcc14 Missing IPV6_AUTOCONF=no to render sysconfig dhcp6 stateful on RHEL (#753)
    aa1014ca doc: document missing IPv6 subnet types (#744)
    30da21bd Add example configuration for datasource `AliYun` (#751)
    e5c67478 integration_tests: add SSH key selection settings (#754)
    48b2c5f1 fix a typo in man page cloud-init.1 (#752)
    b85e4a56 network-config-format-v2.rst: add Netplan Passthrough section (#750)
    c5f6c786 stale: re-enable post holidays (#749)
    aa72426b integration_tests: port ca_certs tests from cloud_tests (#732)
    80847b05 Azure: Add telemetry for poll IMDS (#741)
    5d017ab6 doc: move testing section from HACKING to its own doc (#739)
    b9a5da16 No longer allow integration test failures on travis (#738)
    e4f2d613 stale: fix error in definition (#740)
    b944cbe0 integration_tests: set log-cli-level to INFO by default (#737)
    3c076f4c PULL_REQUEST_TEMPLATE.md: use backticks around commit message (#736)
    fad919aa stale: disable check for holiday break (#735)
    f38ba3ca integration_tests: log the path we collect logs into (#733)
    ac17c6a2 .travis.yml: add (most) supported Python versions to CI (#734)
    0b932e55 integration_tests: fix IN_PLACE CLOUD_INIT_SOURCE (#731)
    a5484d02 cc_ca_certs: add RHEL support (#633)
    91381855 Azure: only generate config for NICs with addresses (#709)
    e5f74595 doc: fix CloudStack configuration example (#707)
    eadadaa1 integration_tests: restrict test_lxd_bridge appropriately (#730)
    9e89ca70 Add integration tests for CLI functionality (#729)
    2022bc72 Integration test for gh-626 (#728)
    ca49e27b Some test_upgrade fixes (#726)
    2af3f6d7 Ensure overriding test vars with env vars works for booleans (#727)
    3339a5a4 integration_tests: port lxd_bridge test from cloud_tests (#718)
    9ea845db Integration test for gh-632. (#725)
    8321f0c0 Integration test for gh-671 (#724)
    00dbc144 integration-requirements.txt: bump pycloudlib commit (#723)
    212b291d Drop unnecessary shebang from cmd/main.py (#722)
    97bfd21d Integration test for LP: #1813396 and #669 (#719)
    1d1649e5 integration_tests: include timestamp in log output (#720)
    05216aa3 integration_tests: add test for LP: #1898997 (#713)
    17ca02e1 Add integration test for power_state_change module (#717)
    7ec314a9 Update documentation for network-config-format-v2 (#701)
    b8df2547 sandbox CA Cert tests to not require ca-certificates (#715)
    54e202a6 Add upgrade integration test (#693)
    aa6350f6 Integration test for 570 (#712)
    974145d0 Add ability to keep snapshotted images in integration tests (#711)
    06f7b452 Integration test for pull #586 (#706)
    6c4e87bf integration_tests: introduce skipping of tests by OS (#702)
    ed9bd19c integration_tests: introduce IntegrationInstance.restart (#708)
    bd76d5cf Add lxd-vm to list of valid integration test platforms (#705)
    f550c876 Adding BOOTPROTO = dhcp to render sysconfig dhcp6 stateful on RHEL (#685)
    2bd34bda Delete image snapshots created for integration tests (#682)
    de3183c1 Parametrize ssh_keys_provided integration test (#700)
    53f2bfbb Drop use_sudo attribute on IntegrationInstance (#694)
    6ee01078 cc_apt_configure: add riscv64 as a ports arch (#687)
    4292a47b cla: add xnox (#692)
    bc9c6c22 Collect logs from integration test runs (#675)
    47f4229e Release 20.4 (#686)
    87df9d6c tox: avoid tox testenv subsvars for xenial support (#684)
    6e86d2a5 Ensure proper root permissions in integration tests (#664)
    8a493bf0 LXD VM support in integration tests (#678)
    e454dea5 Integration test for fallocate falling back to dd (#681)
    66a851ac .travis.yml: correctly integration test the built .deb (#683)
    a4d0feb0 Ability to hot-attach NICs to preprovisioned VMs before reprovisioning (#613)
    66b4be8b Support configuring SSH host certificates. (#660)
    5d4a9a4a add integration test for LP: #1900837 (#679)
    12ef7541 cc_resizefs on FreeBSD: Fix _can_skip_ufs_resize (#655)
    73e704e3 DataSourceAzure: push dmesg log to KVP (#670)
    9707a08a Make mount in place for tests work (#667)
    bfaee8cc integration_tests: restore emission of settings to log (#657)
    eea75449 DataSourceAzure: update password for defuser if exists (#671)
    49d5de92 tox.ini: only select "ci" marked tests for CI runs (#677)
    6df0230b Azure helper: Increase Azure Endpoint HTTP retries (#619)
    d807df28 DataSourceAzure: send failure signal on Azure datasource failure (#594)
    96d21dfb test_persistence: simplify VersionIsPoppedFromState (#674)
    cd752df6 only run a subset of integration tests in CI (#672)
    f6801144 cli: add --system param to allow validating system user-data on a machine (#575)
    e1bde919 test_persistence: add VersionIsPoppedFromState test (#673)
    4f2da1cc introduce an upgrade framework and related testing (#659)
    a925b5a0 add --no-tty option to gpg (#669)
    eeef783b Pin pycloudlib to a working commit (#666)
    8a9ee02d DataSourceOpenNebula: exclude SRANDOM from context output (#665)
    38ba6b30 cloud_tests: add hirsute release definition (#662)
    db2ff11d split integration and cloud_tests requirements (#652)
    39cf5c4e faq.rst: add warning to answer that suggests running `clean` (#661)
    2730521f Fix stacktrace in DataSourceRbxCloud if no metadata disk is found (#632)
    57349eb7 Make wakeonlan Network Config v2 setting actually work (#626)
    0dc2d030 HACKING.md: unify network-refactoring namespace (#658)
    d83c0bb4 replace usage of dmidecode with kenv on FreeBSD (#621)
    b542ce7a Prevent timeout on travis integration tests. (#651)
    c86283f0 azure: enable pushing the log to KVP from the last pushed byte  (#614)
    f4235974 Fix launch_kwargs bug in integration tests (#654)
    cf6c36a1 split read_fs_info into linux & freebsd parts (#625)
    d1c01c1d PULL_REQUEST_TEMPLATE.md: expand commit message section (#642)
    8dfd8801 Make some language improvements in growpart documentation (#649)
    0184e536 Revert ".travis.yml: use a known-working version of lxd (#643)" (#650)
    7978feb3 Fix not sourcing default 50-cloud-init ENI file on Debian (#598)
    2c450039 remove unnecessary reboot from gpart resize (#646)
    0af1ff1e cloudinit: move dmi functions out of util (#622)
    d619f517 integration_tests: various launch improvements (#638)
    2ea3121f test_lp1886531: don't assume /etc/fstab exists (#639)
    0ff34cfb Remove Ubuntu restriction from PR template (#648)
    34f8e221 util: fix mounting of vfat on *BSD (#637)
    815a790c conftest: improve docstring for disable_subp_usage (#644)
    8642e8bc doc: add example query commands to debug Jinja templates (#645)
    f8c84aee Correct documentation and testcase data for some user-data YAML (#618)
    0f8be879 Hetzner: Fix instance_id / SMBIOS serial comparison (#640)
    f72d0cb7 .travis.yml: use a known-working version of lxd (#643)
    a6afe9c5 tools/build-on-freebsd: fix comment explaining purpose of the script (#635)
    1431c8a1 Hetzner: initialize instance_id from system-serial-number (#630)

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

3 files changed, 28 insertions, 33 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 f61b82ce..5c9c1e6f 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
@@ -16,19 +16,16 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  setup.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/setup.py b/setup.py
-index cbacf48e..5f13d9eb 100755
---- a/setup.py
-+++ b/setup.py
-@@ -87,7 +87,7 @@ def render_tmpl(template, mode=None):
+Index: git/setup.py
+===================================================================
+--- git.orig/setup.py
++++ git/setup.py
+@@ -87,7 +87,7 @@
  
      # older versions of tox use bdist (xenial), and then install from there.
      # newer versions just use install.
--    if not (sys.argv[1] == 'install' or sys.argv[1].startswith('bdist*')):
+-    if not (sys.argv[1] == "install" or sys.argv[1].startswith("bdist*")):
 +    if not ('install' in sys.argv or sys.argv[1].startswith('bdist*')):
          return template
  
      tmpl_ext = ".tmpl"
--- 
-2.25.1
-
diff --git a/recipes-extended/cloud-init/cloud-init/0001-setup.py-respect-udevdir-variable.patch b/recipes-extended/cloud-init/cloud-init/0001-setup.py-respect-udevdir-variable.patch
index 94ec98ac..e96b5cbd 100644
--- a/recipes-extended/cloud-init/cloud-init/0001-setup.py-respect-udevdir-variable.patch
+++ b/recipes-extended/cloud-init/cloud-init/0001-setup.py-respect-udevdir-variable.patch
@@ -16,27 +16,24 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  setup.py | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/setup.py b/setup.py
-index cbacf48e..5e137a6d 100755
---- a/setup.py
-+++ b/setup.py
-@@ -142,6 +142,7 @@ INITSYS_ROOTS = {
-     'sysvinit_deb': 'etc/init.d',
-     'sysvinit_openrc': 'etc/init.d',
-     'sysvinit_suse': 'etc/init.d',
+Index: git/setup.py
+===================================================================
+--- git.orig/setup.py
++++ git/setup.py
+@@ -159,6 +159,7 @@
+     "sysvinit_deb": "etc/init.d",
+     "sysvinit_openrc": "etc/init.d",
+     "sysvinit_suse": "etc/init.d",
 +    'udevdir': pkg_config_read('udev', 'udevdir'),
-     'systemd': pkg_config_read('systemd', 'systemdsystemunitdir'),
-     'systemd.generators': pkg_config_read('systemd',
-                                           'systemdsystemgeneratordir'),
-@@ -264,7 +265,7 @@ if not platform.system().endswith('BSD'):
-         (ETC + '/NetworkManager/dispatcher.d/',
-          ['tools/hook-network-manager']),
-         (ETC + '/dhcp/dhclient-exit-hooks.d/', ['tools/hook-dhclient']),
--        (LIB + '/udev/rules.d', [f for f in glob('udev/*.rules')])
-+        ('udevdir' + '/rules.d', [f for f in glob('udev/*.rules')])
-     ])
- # Use a subclass for install that handles
- # adding on the right init system configuration files
--- 
-2.27.0
-
+     "systemd": pkg_config_read("systemd", "systemdsystemunitdir"),
+     "systemd.generators": pkg_config_read(
+         "systemd", "systemdsystemgeneratordir"
+@@ -307,7 +308,7 @@
+                 ["tools/hook-network-manager"],
+             ),
+             (ETC + "/dhcp/dhclient-exit-hooks.d/", ["tools/hook-dhclient"]),
+-            (LIB + "/udev/rules.d", [f for f in glob("udev/*.rules")]),
++            ('udevdir' + "/rules.d", [f for f in glob("udev/*.rules")]),
+             (
+                 ETC + "/systemd/system/sshd-keygen@.service.d/",
+                 ["systemd/disable-sshd-keygen-if-cloud-init-active.conf"],
diff --git a/recipes-extended/cloud-init/cloud-init_20.3.bb b/recipes-extended/cloud-init/cloud-init_21.4.bb
index d5605b86..660b808e 100644
--- a/recipes-extended/cloud-init/cloud-init_20.3.bb
+++ b/recipes-extended/cloud-init/cloud-init_21.4.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c6dd79b6ec2130a3364f6fa9d6380408"
 
-SRCREV = "1431c8a1bddaabf85e1bbb32bf316a3aef20036e"
+SRCREV = "a97fd062f7dbd4b824fd006edd08927ef9dbf24a"
 SRC_URI = "git://github.com/canonical/cloud-init;branch=main;protocol=https \
     file://cloud-init-source-local-lsb-functions.patch \
     file://0001-setup.py-check-for-install-anywhere-in-args.patch \
@@ -55,5 +55,6 @@ RDEPENDS:${PN} = "python3 \
                   python3-jsonschema \
                   python3-pyyaml \
                   python3-oauthlib \
+                  bash \
                  "