T2117: Cloud-init updated to 22.1

Merged with 22.1 tag from the upstream Cloud-init repository.

Our modules were slightly modified for compatibility with the new
version.

1 files changed, 33 insertions, 0 deletions

diff --git a/tests/integration_tests/bugs/test_gh632.py b/tests/integration_tests/bugs/test_gh632.py
new file mode 100644
index 00000000..c7a897c6
--- /dev/null
+++ b/tests/integration_tests/bugs/test_gh632.py
@@ -0,0 +1,33 @@
+"""Integration test for gh-632.
+
+Verify that if cloud-init is using DataSourceRbxCloud, there is
+no traceback if the metadata disk cannot be found.
+"""
+import pytest
+
+from tests.integration_tests.instances import IntegrationInstance
+from tests.integration_tests.util import verify_clean_log
+
+
+# With some datasource hacking, we can run this on a NoCloud instance
+@pytest.mark.lxd_container
+@pytest.mark.lxd_vm
+def test_datasource_rbx_no_stacktrace(client: IntegrationInstance):
+    client.write_to_file(
+        "/etc/cloud/cloud.cfg.d/90_dpkg.cfg",
+        "datasource_list: [ RbxCloud, NoCloud ]\n",
+    )
+    client.write_to_file(
+        "/etc/cloud/ds-identify.cfg",
+        "policy: enabled\n",
+    )
+    client.execute("cloud-init clean --logs")
+    client.restart()
+
+    log = client.read_from_file("/var/log/cloud-init.log")
+    verify_clean_log(log)
+    assert "Failed to load metadata and userdata" not in log
+    assert (
+        "Getting data from <class 'cloudinit.sources.DataSourceRbxCloud."
+        "DataSourceRbxCloud'> failed" not in log
+    )