Skip to content

Commit ae3a7d8

Browse files
committed
Revert "cloud-init: uprev to 22.2 (#3104)"
This reverts commit 3bcdc43. Reverting this change temporarily because we are not ready to upgrade cloud-init.
1 parent 68bd0ec commit ae3a7d8

File tree

4 files changed

+241
-303
lines changed

4 files changed

+241
-303
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Signatures": {
33
"10-azure-kvp.cfg": "79e0370c010be5cd4717960e4b414570c9ec6e6d29aede77ccecc43d2b03bb9a",
4-
"cloud-init-22.2.tar.gz": "240b170d0241f10fd1eb0d09c8584ee4ec68ef71418af41bdef8b32ea37856dd"
4+
"cloud-init-22.1.tar.gz": "a3738cb7ce95454fae5ffd5589f9e45d7109ffbbc38313213ca478ecb831ae2c"
55
}
6-
}
6+
}

SPECS/cloud-init/cloud-init.spec

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%define cl_services cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service
22
Summary: Cloud instance init scripts
33
Name: cloud-init
4-
Version: 22.2
4+
Version: 22.1
55
Release: 2%{?dist}
66
License: GPLv3
77
Vendor: Microsoft Corporation
@@ -10,7 +10,8 @@ Group: System Environment/Base
1010
URL: https://launchpad.net/cloud-init
1111
Source0: https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz
1212
Source1: 10-azure-kvp.cfg
13-
Patch0: add-mariner-distro-support.patch
13+
# Add Mariner distro support to cloud-init 22.1
14+
Patch0: mariner-22.1.patch
1415
BuildRequires: automake
1516
BuildRequires: dbus
1617
BuildRequires: iproute
@@ -141,9 +142,6 @@ make check %{?_smp_mflags}
141142
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/10-azure-kvp.cfg
142143

143144
%changelog
144-
* Fri Jun 03 2022 Chris Patterson <[email protected]> - 22.2-1
145-
- Update to cloud-init 22.2
146-
147145
* Mon Mar 28 2022 Henry Beberman <[email protected]> - 22.1-2
148146
- Add netplan defaults to Mariner distro config patch
149147

0 commit comments

Comments
 (0)