Skip to content
Snippets Groups Projects
Verified Commit f2b29487 authored by Louis Abel's avatar Louis Abel :tv:
Browse files

patch fixes

parent 325fd1c4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ROCKY/_supporting/cloud-init-rocky-support.patch
+ 82
− 89
View file @ f2b29487
diff -Nprwu cloud-init-20.3-orig/cloudinit/config/cc_ntp.py cloud-init-20.3/cloudinit/config/cc_ntp.py
--- cloud-init-20.3-orig/cloudinit/config/cc_ntp.py 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3/cloudinit/config/cc_ntp.py 2021-05-18 15:08:50.500963494 -0700
diff -Nrpuw cloud-init-20.3/cloudinit/config/cc_ntp.py cloud-init-20.3-patch/cloudinit/config/cc_ntp.py
--- cloud-init-20.3/cloudinit/config/cc_ntp.py 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3-patch/cloudinit/config/cc_ntp.py 2021-05-19 23:48:29.655808889 -0700
@@ -25,7 +25,7 @@ frequency = PER_INSTANCE
NTP_CONF = '/etc/ntp.conf'
NR_POOL_SERVERS = 4
......@@ -10,9 +10,21 @@ diff -Nprwu cloud-init-20.3-orig/cloudinit/config/cc_ntp.py cloud-init-20.3/clou
NTP_CLIENT_CONFIG = {
'chrony': {
diff -Nprwu cloud-init-20.3-orig/cloudinit/distros/__init__.py cloud-init-20.3/cloudinit/distros/__init__.py
--- cloud-init-20.3-orig/cloudinit/distros/__init__.py 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3/cloudinit/distros/__init__.py 2021-05-18 15:09:52.292529445 -0700
diff -Nrpuw cloud-init-20.3/cloudinit/config/cc_yum_add_repo.py cloud-init-20.3-patch/cloudinit/config/cc_yum_add_repo.py
--- cloud-init-20.3/cloudinit/config/cc_yum_add_repo.py 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3-patch/cloudinit/config/cc_yum_add_repo.py 2021-05-19 23:48:49.166673671 -0700
@@ -36,7 +36,7 @@ from configparser import ConfigParser
from cloudinit import util
-distros = ['centos', 'fedora', 'rhel']
+distros = ['centos', 'fedora', 'rhel', 'rocky']
def _canonicalize_id(repo_id):
diff -Nrpuw cloud-init-20.3/cloudinit/distros/__init__.py cloud-init-20.3-patch/cloudinit/distros/__init__.py
--- cloud-init-20.3/cloudinit/distros/__init__.py 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3-patch/cloudinit/distros/__init__.py 2021-05-19 23:51:48.659429667 -0700
@@ -45,7 +45,7 @@ OSFAMILIES = {
'debian': ['debian', 'ubuntu'],
'freebsd': ['freebsd'],
......@@ -22,25 +34,21 @@ diff -Nprwu cloud-init-20.3-orig/cloudinit/distros/__init__.py cloud-init-20.3/c
'suse': ['opensuse', 'sles'],
}
diff -Nprwu cloud-init-20.3-orig/cloudinit/distros/rocky.py cloud-init-20.3/cloudinit/distros/rocky.py
--- cloud-init-20.3-orig/cloudinit/distros/rocky.py 1969-12-31 17:00:00.000000000 -0700
+++ cloud-init-20.3/cloudinit/distros/rocky.py 2021-05-18 15:10:13.737378805 -0700
@@ -0,0 +1,12 @@
+# This file is part of cloud-init. See LICENSE file for license information.
diff -Nrpuw cloud-init-20.3/cloudinit/distros/rocky.py cloud-init-20.3-patch/cloudinit/distros/rocky.py
--- cloud-init-20.3/cloudinit/distros/rocky.py 1969-12-31 17:00:00.000000000 -0700
+++ cloud-init-20.3-patch/cloudinit/distros/rocky.py 2021-05-19 23:53:28.997734253 -0700
@@ -0,0 +1,8 @@
+# file part of cloud-init
+
+from cloudinit.distros import rhel
+from cloudinit import log as logging
+
+LOG = logging.getLogger(__name__)
+
+
+class Distro(rhel.Distro):
+ pass
+
+# vi: ts=4 expandtab
diff -Nprwu cloud-init-20.3-orig/cloudinit/net/sysconfig.py cloud-init-20.3/cloudinit/net/sysconfig.py
--- cloud-init-20.3-orig/cloudinit/net/sysconfig.py 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3/cloudinit/net/sysconfig.py 2021-05-18 15:15:54.155987543 -0700
diff -Nrpuw cloud-init-20.3/cloudinit/net/sysconfig.py cloud-init-20.3-patch/cloudinit/net/sysconfig.py
--- cloud-init-20.3/cloudinit/net/sysconfig.py 2021-05-20 00:16:02.079356525 -0700
+++ cloud-init-20.3-patch/cloudinit/net/sysconfig.py 2021-05-19 23:54:01.119511632 -0700
@@ -19,7 +19,7 @@ from .network_state import (
LOG = logging.getLogger(__name__)
......@@ -50,21 +58,9 @@ diff -Nprwu cloud-init-20.3-orig/cloudinit/net/sysconfig.py cloud-init-20.3/clou
def _make_header(sep='#'):
diff -Nprwu cloud-init-20.3-orig/cloudinit/sources/DataSourceRbxCloud.py cloud-init-20.3/cloudinit/sources/DataSourceRbxCloud.py
--- cloud-init-20.3-orig/cloudinit/sources/DataSourceRbxCloud.py 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3/cloudinit/sources/DataSourceRbxCloud.py 2021-05-18 15:16:43.545640596 -0700
@@ -53,7 +53,7 @@ def _sub_arp(cmd):
def gratuitous_arp(items, distro):
source_param = '-S'
- if distro.name in ['fedora', 'centos', 'rhel']:
+ if distro.name in ['fedora', 'centos', 'rhel', 'rocky']:
source_param = '-s'
for item in items:
try:
diff -Nprwu cloud-init-20.3-orig/cloudinit/util.py cloud-init-20.3/cloudinit/util.py
--- cloud-init-20.3-orig/cloudinit/util.py 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3/cloudinit/util.py 2021-05-18 15:17:18.307396413 -0700
diff -Nrpuw cloud-init-20.3/cloudinit/util.py cloud-init-20.3-patch/cloudinit/util.py
--- cloud-init-20.3/cloudinit/util.py 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3-patch/cloudinit/util.py 2021-05-19 23:54:42.349225881 -0700
@@ -549,7 +549,7 @@ def system_info():
linux_dist = info['dist'][0].lower()
if linux_dist in (
......@@ -74,28 +70,29 @@ diff -Nprwu cloud-init-20.3-orig/cloudinit/util.py cloud-init-20.3/cloudinit/uti
var = linux_dist
elif linux_dist in ('ubuntu', 'linuxmint', 'mint'):
var = 'ubuntu'
diff -Nprwu cloud-init-20.3-orig/config/cloud.cfg.tmpl cloud-init-20.3/config/cloud.cfg.tmpl
--- cloud-init-20.3-orig/config/cloud.cfg.tmpl 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3/config/cloud.cfg.tmpl 2021-05-18 15:19:03.290658958 -0700
@@ -21,7 +21,7 @@ disable_root: false
diff -Nrpuw cloud-init-20.3/config/cloud.cfg.tmpl cloud-init-20.3-patch/config/cloud.cfg.tmpl
--- cloud-init-20.3/config/cloud.cfg.tmpl 2021-05-20 00:16:02.075356552 -0700
+++ cloud-init-20.3-patch/config/cloud.cfg.tmpl 2021-05-19 23:57:36.687017603 -0700
@@ -21,7 +21,8 @@ disable_root: false
disable_root: true
{% endif %}
-{% if variant in ["alpine", "amazon", "centos", "fedora", "rhel"] %}
+{% if variant in ["alpine", "amazon", "centos", "fedora", "rhel", "rocky"] %}
+{% if variant in ["alpine", "amazon", "centos", "fedora",
+ "rhel", "rocky"] %}
mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2']
{% if variant == "amazon" %}
resize_rootfs: noblock
@@ -153,7 +153,7 @@ system_info:
@@ -155,7 +156,7 @@ system_info:
# This will affect which distro class gets used
{% if variant in ["alpine", "amazon", "arch", "centos", "debian",
"fedora", "freebsd", "netbsd", "openbsd", "rhel",
- "suse", "ubuntu"] %}
+ "suse", "ubuntu". "rocky"] %}
+ "suse", "ubuntu", "rocky"] %}
distro: {{ variant }}
{% else %}
# Unknown/fallback distro.
@@ -205,7 +205,7 @@ system_info:
@@ -207,7 +208,7 @@ system_info:
security: http://ports.ubuntu.com/ubuntu-ports
ssh_svcname: ssh
{% elif variant in ["alpine", "amazon", "arch", "centos", "fedora",
......@@ -104,21 +101,9 @@ diff -Nprwu cloud-init-20.3-orig/config/cloud.cfg.tmpl cloud-init-20.3/config/cl
# Default user name + that default users groups (if added/used)
default_user:
{% if variant == "amazon" %}
diff -Nprwu cloud-init-20.3-orig/doc/rtd/topics/availability.rst cloud-init-20.3/doc/rtd/topics/availability.rst
--- cloud-init-20.3-orig/doc/rtd/topics/availability.rst 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3/doc/rtd/topics/availability.rst 2021-05-18 15:19:20.378538930 -0700
@@ -25,7 +25,7 @@ and OpenBSD:
- Gentoo Linux
- NetBSD
- OpenBSD
-- RHEL/CentOS
+- RHEL/CentOS/Rocky
- SLES/openSUSE
- Ubuntu
diff -Nprwu cloud-init-20.3-orig/Makefile cloud-init-20.3/Makefile
--- cloud-init-20.3-orig/Makefile 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3/Makefile 2021-05-18 15:23:06.820948289 -0700
diff -Nrpuw cloud-init-20.3/Makefile cloud-init-20.3-patch/Makefile
--- cloud-init-20.3/Makefile 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3-patch/Makefile 2021-05-20 00:10:25.441689639 -0700
@@ -35,6 +35,9 @@ ci-deps-ubuntu:
ci-deps-centos:
@$(PYTHON) $(CWD)/tools/read-dependencies --distro centos --test-distro
......@@ -129,21 +114,9 @@ diff -Nprwu cloud-init-20.3-orig/Makefile cloud-init-20.3/Makefile
pip-requirements:
@echo "Installing cloud-init dependencies..."
$(PIP_INSTALL) -r "$@.txt" -q
diff -Nprwu cloud-init-20.3-orig/README.md cloud-init-20.3/README.md
--- cloud-init-20.3-orig/README.md 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3/README.md 2021-05-18 15:23:43.224692574 -0700
@@ -39,7 +39,7 @@ get in contact with that distribution an
| Supported OSes | Supported Public Clouds | Supported Private Clouds |
| --- | --- | --- |
-| Alpine Linux<br />ArchLinux<br />Debian<br />Fedora<br />FreeBSD<br />Gentoo Linux<br />NetBSD<br />OpenBSD<br />RHEL/CentOS<br />SLES/openSUSE<br />Ubuntu<br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /> | Amazon Web Services<br />Microsoft Azure<br />Google Cloud Platform<br />Oracle Cloud Infrastructure<br />Softlayer<br />Rackspace Public Cloud<br />IBM Cloud<br />Digital Ocean<br />Bigstep<br />Hetzner<br />Joyent<br />CloudSigma<br />Alibaba Cloud<br />OVH<br />OpenNebula<br />Exoscale<br />Scaleway<br />CloudStack<br />AltCloud<br />SmartOS<br />HyperOne<br />Rootbox<br /> | Bare metal installs<br />OpenStack<br />LXD<br />KVM<br />Metal-as-a-Service (MAAS)<br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />|
+| Alpine Linux<br />ArchLinux<br />Debian<br />Fedora<br />FreeBSD<br />Gentoo Linux<br />NetBSD<br />OpenBSD<br />RHEL/CentOS/Rocky<br />SLES/openSUSE<br />Ubuntu<br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /> | Amazon Web Services<br />Microsoft Azure<br />Google Cloud Platform<br />Oracle Cloud Infrastructure<br />Softlayer<br />Rackspace Public Cloud<br />IBM Cloud<br />Digital Ocean<br />Bigstep<br />Hetzner<br />Joyent<br />CloudSigma<br />Alibaba Cloud<br />OVH<br />OpenNebula<br />Exoscale<br />Scaleway<br />CloudStack<br />AltCloud<br />SmartOS<br />HyperOne<br />Rootbox<br /> | Bare metal installs<br />OpenStack<br />LXD<br />KVM<br />Metal-as-a-Service (MAAS)<br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />|
## To start developing cloud-init
diff -Nprwu cloud-init-20.3-orig/systemd/cloud-init-generator.tmpl cloud-init-20.3/systemd/cloud-init-generator.tmpl
--- cloud-init-20.3-orig/systemd/cloud-init-generator.tmpl 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3/systemd/cloud-init-generator.tmpl 2021-05-18 15:25:29.704952789 -0700
diff -Nrpuw cloud-init-20.3/systemd/cloud-init-generator.tmpl cloud-init-20.3-patch/systemd/cloud-init-generator.tmpl
--- cloud-init-20.3/systemd/cloud-init-generator.tmpl 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3-patch/systemd/cloud-init-generator.tmpl 2021-05-20 00:00:03.170002382 -0700
@@ -83,7 +83,7 @@ default() {
check_for_datasource() {
......@@ -153,18 +126,30 @@ diff -Nprwu cloud-init-20.3-orig/systemd/cloud-init-generator.tmpl cloud-init-20
local dsidentify="/usr/libexec/cloud-init/ds-identify"
{% else %}
local dsidentify="/usr/lib/cloud-init/ds-identify"
diff -Nprwu cloud-init-20.3-orig/tools/read-dependencies cloud-init-20.3/tools/read-dependencies
--- cloud-init-20.3-orig/tools/read-dependencies 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3/tools/read-dependencies 2021-05-18 15:35:07.943018755 -0700
@@ -24,6 +24,7 @@ DEFAULT_REQUIREMENTS = 'requirements.txt
DISTRO_PKG_TYPE_MAP = {
diff -Nrpuw cloud-init-20.3/systemd/cloud-init.service.tmpl cloud-init-20.3-patch/systemd/cloud-init.service.tmpl
--- cloud-init-20.3/systemd/cloud-init.service.tmpl 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3-patch/systemd/cloud-init.service.tmpl 2021-05-20 00:00:16.746908284 -0700
@@ -10,7 +10,7 @@ After=systemd-networkd-wait-online.servi
{% if variant in ["ubuntu", "unknown", "debian"] %}
After=networking.service
{% endif %}
-{% if variant in ["centos", "fedora", "rhel"] %}
+{% if variant in ["centos", "fedora", "rhel", "rocky"] %}
After=network.service
After=NetworkManager.service
{% endif %}
diff -Nrpuw cloud-init-20.3/tools/read-dependencies cloud-init-20.3-patch/tools/read-dependencies
--- cloud-init-20.3/tools/read-dependencies 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3-patch/tools/read-dependencies 2021-05-20 00:15:48.842448266 -0700
@@ -25,6 +25,7 @@ DISTRO_PKG_TYPE_MAP = {
'centos': 'redhat',
'redhat': 'redhat',
+ 'rocky': 'redhat',
'debian': 'debian',
+ 'rocky': 'redhat',
'ubuntu': 'debian',
'opensuse': 'suse',
@@ -66,6 +67,7 @@ ZYPPER_INSTALL = [
'suse': 'suse'
@@ -66,11 +67,13 @@ ZYPPER_INSTALL = [
DRY_DISTRO_INSTALL_PKG_CMD = {
'centos': ['yum', 'install', '--assumeyes'],
'redhat': ['yum', 'install', '--assumeyes'],
......@@ -172,22 +157,30 @@ diff -Nprwu cloud-init-20.3-orig/tools/read-dependencies cloud-init-20.3/tools/r
}
DISTRO_INSTALL_PKG_CMD = {
@@ -83,6 +85,7 @@ CI_SYSTEM_BASE_PKGS = {
'common': ['make', 'sudo', 'tar'],
'redhat': ['python3-tox'],
'centos': ['python3-tox'],
+ 'rocky': ['python3-tox'],
'ubuntu': ['devscripts', 'python3-dev', 'libssl-dev', 'tox', 'sbuild'],
'debian': ['devscripts', 'python3-dev', 'libssl-dev', 'tox', 'sbuild']}
@@ -275,8 +278,9 @@ def pkg_install(pkg_list, distro, test_d
'centos': MAYBE_RELIABLE_YUM_INSTALL,
'redhat': MAYBE_RELIABLE_YUM_INSTALL,
+ 'rocky': MAYBE_RELIABLE_YUM_INSTALL,
'debian': ['apt', 'install', '-y'],
'ubuntu': ['apt', 'install', '-y'],
'opensuse': ZYPPER_INSTALL,
@@ -276,7 +279,7 @@ def pkg_install(pkg_list, distro, test_d
if distro in ['centos', 'redhat']:
# CentOS and Redhat need epel-release to access oauthlib and jsonschema
+ # Rocky Linux 8 does not require epel-release.
subprocess.check_call(install_cmd + ['epel-release'])
- if distro in ['suse', 'opensuse', 'redhat', 'centos']:
+ if distro in ['suse', 'opensuse', 'redhat', 'centos', 'rocky']:
pkg_list.append('rpm-build')
subprocess.check_call(install_cmd + pkg_list)
diff -Nrpuw cloud-init-20.3/tools/render-cloudcfg cloud-init-20.3-patch/tools/render-cloudcfg
--- cloud-init-20.3/tools/render-cloudcfg 2020-08-25 09:28:27.000000000 -0700
+++ cloud-init-20.3-patch/tools/render-cloudcfg 2021-05-20 00:02:44.673883052 -0700
@@ -6,7 +6,7 @@ import sys
VARIANTS = ["alpine", "amazon", "arch", "centos", "debian", "fedora",
"freebsd", "netbsd", "openbsd", "rhel", "suse", "ubuntu",
- "unknown"]
+ "rocky", "unknown"]
if "avoid-pep8-E402-import-not-top-of-file":
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment