starlingx/integ
Code Issues Proposed changes

CentOS 8: Upgrade cloud-init to version 18.2

Browse Source 
(1)Release Version Upgrade
(2)Matching code changes with el7 to el8

Story: 2006729
Task: 37682
Depends-On: https://review.opendev.org/#/c/696481/
Depends-On: https://review.opendev.org/#/c/696050/
Change-Id: I7ef21a833d29d79c18309b200c9ae7b9c84a16d3
Signed-off-by: Long Li <lilong-neu@neusoft.com>
This commit is contained in:
Long Li 2019-11-20 17:18:26 +08:00
parent 9035cd1be8
commit e8e689c149
5 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virt/cloud-init/centos/build_srpm.data
View File

@ -1 +1 @@
TIS_PATCH_VER=4
TIS_PATCH_VER=1

10
virt/cloud-init/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -8,15 +8,15 @@ Subject: [PATCH] Update-package-versioning-for-TIS-format
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec
index 390ed96..ef82dd1 100644
index 60bf175..a873d81 100644
--- a/SPECS/cloud-init.spec
+++ b/SPECS/cloud-init.spec
@@ -7,7 +7,7 @@
@@ -6,7 +6,7 @@
Name: cloud-init
Version: 0.7.9
-Release: 24%{?dist}.1
+Release: 24.el7.centos.1%{?_tis_dist}.%{tis_patch_ver}
Version: 18.2
-Release: 6%{?dist}
+Release: 6.el8%{?_tis_dist}.%{tis_patch_ver}
Summary: Cloud instance init scripts
Group: System Environment/Base

21
virt/cloud-init/centos/meta_patches/spec-include-tis-changes.patch
View File

@ -4,25 +4,22 @@ Date: Wed, 8 Nov 2017 11:13:02 -0500
Subject: [PATCH] spec-include-tis-changes
---
SPECS/cloud-init.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
SPECS/cloud-init.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec
index ef82dd1..022e779 100644
index a873d81..1175601 100644
--- a/SPECS/cloud-init.spec
+++ b/SPECS/cloud-init.spec
@@ -69,7 +69,10 @@ Patch41: ci-DataSourceAzure.py-use-hostnamectl-to-set-hostname.patch
# For bz#1578702 - cloud-init-0.7.9-9.el7_4.6 breaks IPv4/IPv6 dual-stack EC2 instances in AWS [rhel-7.5.z]
Patch42: ci-sysconfig-Don-t-disable-IPV6_AUTOCONF.patch
@@ -38,6 +38,8 @@ Patch15: ci-Fix-string-missmatch-when-mounting-ntfs.patch
# For bz#1602784 - cloud-init: Sometimes image boots fingerprints is configured, there's a network device present but it's not configured
Patch16: ci-net-Make-sysconfig-renderer-compatible-with-Network-.patch
-Patch9999: cloud-init-add-centos-os.patch
+Patch0999: cloud-init-add-centos-os.patch
+Patch1000: cloud-init-interactive-parted.patch
+
+# WRS patches
+Patch2000: cloud-init-interactive-parted.patch
BuildArch: noarch
# Deal with noarch -> arch
# https://bugzilla.redhat.com/show_bug.cgi?id=1067089
BuildRequires: pkgconfig(systemd)
--
2.7.4

4
virt/cloud-init/centos/patches/cloud-init-interactive-parted.patch
View File

@ -8,7 +8,7 @@ Subject: [PATCH] cloud-init-interactive-parted
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cloudinit/config/cc_growpart.py b/cloudinit/config/cc_growpart.py
index 832bb3f..71c4f7f 100644
index bafca9d..88e7bbb 100644
--- a/cloudinit/config/cc_growpart.py
+++ b/cloudinit/config/cc_growpart.py
@@ -182,7 +182,7 @@ class ResizeGpart(object):
@ -21,5 +21,5 @@ index 832bb3f..71c4f7f 100644
util.logexc(LOG, "Failed: gpart resize -i %s %s", partnum, diskdev)
raise ResizeFailedException(e)
--
1.8.3.1
2.7.4

2
virt/cloud-init/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/cloud-init-0.7.9-24.el7.centos.1.src.rpm
mirror:Source/cloud-init-18.2-6.el8.src.rpm