rpms
/
cloud-init
8
1
Fork 1
Code Issues Pull Requests Releases Activity

- Check for null ssh_genkeytypes value in cloud.cfg that 

breaks ssh connectivity after upgrade to a newer version of cloud-init.
This commit is contained in:
eabdullin 2023-08-02 16:28:54 +03:00
parent 3717cd4682
commit d435648cb3
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
SPECS/cloud-init.spec
View File

@ -1,6 +1,6 @@
Name: cloud-init
Version: 22.1
Release: 9%{?dist}.alma
Release: 10%{?dist}.alma
Summary: Cloud instance init scripts
License: ASL 2.0 or GPLv3
URL: http://launchpad.net/cloud-init
@ -178,7 +178,28 @@ if [ $1 -eq 1 ] ; then
/bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || :
/bin/systemctl enable cloud-init.target >/dev/null 2>&1 || :
elif [ $1 -eq 2 ]; then
# Upgrade. If the upgrade is from a version older than 0.7.9-8,
# Changes from upstream - https://gitlab.com/redhat/centos-stream/rpms/cloud-init/-/commit/904e611fc228001adc0febb0218eebbca6a56dd7
# Upgrade
# RHBZ 2210012 - check for null ssh_genkeytypes value in cloud.cfg that
# breaks ssh connectivity after upgrade to a newer version of cloud-init.
if [ -f %{_sysconfdir}/cloud/cloud.cfg.rpmnew ] && grep -q '^\s*ssh_genkeytypes:\s*~\s*$' %{_sysconfdir}/cloud/cloud.cfg ; then
echo "***********************************************"
echo "*** WARNING!!!! ***"
echo ""
echo "ssh_genkeytypes set to null in /etc/cloud/cloud.cfg!"
echo "SSH access might be broken after reboot. Please check the following KCS"
echo "for more detailed information:"
echo ""
echo "https://access.redhat.com/solutions/6988034"
echo ""
echo "Please reconcile the differences between /etc/cloud/cloud.cfg and "
echo "/etc/cloud/cloud.cfg.rpmnew and update ssh_genkeytypes configuration in "
echo "/etc/cloud/cloud.cfg to a list of keytype values, something like:"
echo "ssh_genkeytypes: ['rsa', 'ecdsa', 'ed25519']"
echo ""
echo "************************************************"
fi
# If the upgrade is from a version older than 0.7.9-8,
# there will be stale systemd config
/bin/systemctl is-enabled cloud-config.service >/dev/null 2>&1 &&
/bin/systemctl reenable cloud-config.service >/dev/null 2>&1 || :
@ -247,6 +268,10 @@ fi
%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
%changelog
* Wed Aug 02 2023 Eduard Abdullin <eabdullin@almalinux.org> - 22.1-10.alma
- Check for null ssh_genkeytypes value in cloud.cfg that
breaks ssh connectivity after upgrade to a newer version of cloud-init.
* Tue May 09 2023 Elkhan Mammadli <elkhan@almalinux.org> - 22.1-9.alma
- Fix and Improve AlmaLinux support