cloud-init: upgrade to v22.2

Change-Id: I71c24c731aa61f9e5cd5cfb1994af2a00c72671a Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/16106 Tested-by: gerrit-photon <[email protected]> Reviewed-by: Shreenidhi Shedi <[email protected]>
shatur93 · May 24, 2022 · a0ef4d5 · a0ef4d5
1 parent 7368b7a
commit a0ef4d5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/SPECS/cloud-init/cloud-init-azureds.patch b/SPECS/cloud-init/cloud-init-azureds.patch
@@ -9,8 +9,8 @@ index d07dc3c0..c5d93a7d 100755
  import json
  import logging
  import os
-@@ -28,6 +29,7 @@ from cloudinit import (
- from cloudinit.net import dhcp
+@@ -19,6 +20,7 @@ from cloudinit import (
+ from cloudinit import distros, subp, temp_utils, url_helper, util, version
  from cloudinit.reporting import events
  from cloudinit.settings import CFG_BUILTIN
 +from io import StringIO
@@ -23,12 +23,12 @@ index d07dc3c0..c5d93a7d 100755
 
 +NETWORKD_LEASES_DIR = '/run/systemd/netif/leases'
 +
- 
+
  def azure_ds_telemetry_reporter(func):
      def impl(*args, **kwargs):
-@@ -903,6 +907,32 @@ class WALinuxAgentShim:
-                 ) from e
-         return dhcp_options
+@@ -942,6 +945,32 @@ class WALinuxAgentShim:
+         report_diagnostic_event(msg, logger_func=LOG.debug)
+         return goal_state
 
 +    @staticmethod
 +    def networkd_parse_lease(content):
@@ -56,14 +56,6 @@ index d07dc3c0..c5d93a7d 100755
 +                util.load_file(os.path.join(leases_d, lfile)))
 +        return ret
 +
-     @staticmethod
      @azure_ds_telemetry_reporter
-     def _get_value_from_dhcpoptions(dhcp_options):
-@@ -956,6 +986,7 @@ class WALinuxAgentShim:
-             )
-             dhcp_options = WALinuxAgentShim._load_dhclient_json()
-             value = WALinuxAgentShim._get_value_from_dhcpoptions(dhcp_options)
-+            LOG.debug('networkd value from lease %s', value)
-         if value is None:
-             # Fallback and check the leases file if unsuccessful
-             report_diagnostic_event(
+     def _get_user_pubkeys(
+         self, goal_state: GoalState, pubkey_info: list
diff --git a/SPECS/cloud-init/cloud-init.spec b/SPECS/cloud-init/cloud-init.spec
@@ -1,5 +1,5 @@
 Name:           cloud-init
-Version:        22.1
+Version:        22.2
 Release:        1%{?dist}
 Summary:        Cloud instance init scripts
 Group:          System Environment/Base
@@ -9,7 +9,7 @@ Vendor:         VMware, Inc.
 Distribution:   Photon
 
 Source0:        https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz
-%define sha1 %{name}=830185bb5ce87ad86e4d1c0c62329bb255ec1648
+%define sha512  %{name}=07fec2f1d6eab20a1161672bb339a0c6b2826540bcb03936f95458b179fcb1b3142773c9a4038fe02b30bb05a5ca48a4153b6b0f59015b43bd6c6602832f9d6f
 
 Patch0: cloud-init-azureds.patch
 Patch1: ds-identify.patch
@@ -41,6 +41,7 @@ BuildRequires: python3-pip
 BuildRequires: python3-configobj
 BuildRequires: python3-jsonpatch
 BuildRequires: python3-pytest
+BuildRequires: python3-jsonschema
 %endif
 
 Requires: iproute2
@@ -106,7 +107,7 @@ echo -e 'CERT1\nLINE2\nLINE3\nCERT2\nLINE2\nLINE3' > "${crt_file}"
 conf_file='/etc/ca-certificates.conf'
 echo -e 'line1\nline2\nline3\ncloud-init-ca-certs.crt\n' > "${conf_file}"
 
-%define test_pkgs pytest-metadata unittest2 mock attrs iniconfig httpretty netifaces
+%define test_pkgs pytest-metadata unittest2 mock attrs iniconfig httpretty netifaces responses pytest-mock
 
 pip3 install --upgrade %test_pkgs
 make check %{?_smp_mflags}
@@ -127,6 +128,7 @@ rm -rf %{buildroot}
 %systemd_postun %cl_services
 
 %files
+%defattr(-,root,root)
 %{_bindir}/*
 %license LICENSE
 %{python3_sitelib}/*
@@ -147,6 +149,8 @@ rm -rf %{buildroot}
 %{_sysconfdir}/systemd/system/[email protected]/disable-sshd-keygen-if-cloud-init-active.conf
 
 %changelog
+* Thu May 19 2022 Shivani Agarwal <[email protected]> 22.2-1
+- Upgrade to v22.2
 * Thu Feb 17 2022 Shreenidhi Shedi <[email protected]> 22.1-1
 - Upgrade to v22.1
 * Mon Nov 15 2021 Shreenidhi Shedi <[email protected]> 21.4-1

diff --git a/SPECS/cloud-init/ds-identify.patch b/SPECS/cloud-init/ds-identify.patch
@@ -22,8 +22,8 @@ index f509f566..2aeb1655 100755
 -DI_DEFAULT_POLICY="search,found=all,maybe=all,notfound=${DI_DISABLED}"
 +DI_DEFAULT_POLICY="search,found=all,maybe=all,notfound=${DI_ENABLED}"
  DI_DEFAULT_POLICY_NO_DMI="search,found=all,maybe=all,notfound=${DI_ENABLED}"
+ DI_DMI_BOARD_NAME=""
  DI_DMI_CHASSIS_ASSET_TAG=""
- DI_DMI_PRODUCT_NAME=""
 -- 
 2.32.0