Skip to content

Commit

Permalink
Revert "cloud-init: uprev to 22.2 (#3104)"
Browse files Browse the repository at this point in the history
This reverts commit 3bcdc43.
Reverting this change temporarily because we are not ready to upgrade cloud-init.
  • Loading branch information
jslobodzian committed Jun 17, 2022
1 parent 68bd0ec commit ae3a7d8
Show file tree
Hide file tree
Showing 4 changed files with 241 additions and 303 deletions.
4 changes: 2 additions & 2 deletions SPECS/cloud-init/cloud-init.signatures.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Signatures": {
"10-azure-kvp.cfg": "79e0370c010be5cd4717960e4b414570c9ec6e6d29aede77ccecc43d2b03bb9a",
"cloud-init-22.2.tar.gz": "240b170d0241f10fd1eb0d09c8584ee4ec68ef71418af41bdef8b32ea37856dd"
"cloud-init-22.1.tar.gz": "a3738cb7ce95454fae5ffd5589f9e45d7109ffbbc38313213ca478ecb831ae2c"
}
}
}
8 changes: 3 additions & 5 deletions SPECS/cloud-init/cloud-init.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%define cl_services cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service
Summary: Cloud instance init scripts
Name: cloud-init
Version: 22.2
Version: 22.1
Release: 2%{?dist}
License: GPLv3
Vendor: Microsoft Corporation
Expand All @@ -10,7 +10,8 @@ Group: System Environment/Base
URL: https://launchpad.net/cloud-init
Source0: https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz
Source1: 10-azure-kvp.cfg
Patch0: add-mariner-distro-support.patch
# Add Mariner distro support to cloud-init 22.1
Patch0: mariner-22.1.patch
BuildRequires: automake
BuildRequires: dbus
BuildRequires: iproute
Expand Down Expand Up @@ -141,9 +142,6 @@ make check %{?_smp_mflags}
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/10-azure-kvp.cfg

%changelog
* Fri Jun 03 2022 Chris Patterson <[email protected]> - 22.2-1
- Update to cloud-init 22.2

* Mon Mar 28 2022 Henry Beberman <[email protected]> - 22.1-2
- Add netplan defaults to Mariner distro config patch

Expand Down
Loading

0 comments on commit ae3a7d8

Please sign in to comment.