Compare commits
No commits in common. "imports/c8s/cloud-init-21.1-2.el8" and "c8" have entirely different histories.
imports/c8
...
c8
|
@ -1 +1 @@
|
||||||
2ae378aa2ae23b34b0ff123623ba5e2fbdc4928d SOURCES/cloud-init-21.1.tar.gz
|
e73116733f5636eb4bc1a5e47e802c3635b9bfa2 SOURCES/23.4.tar.gz
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
SOURCES/cloud-init-21.1.tar.gz
|
SOURCES/23.4.tar.gz
|
||||||
|
|
|
@ -1,561 +0,0 @@
|
||||||
From 074cb9b011623849cfa95c1d7cc813bb28f03ff0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Date: Fri, 7 May 2021 13:36:03 +0200
|
|
||||||
Subject: Add initial redhat setup
|
|
||||||
|
|
||||||
Merged patches (21.1):
|
|
||||||
- 915d30ad Change gating file to correct rhel version
|
|
||||||
- 311f318d Removing net-tools dependency
|
|
||||||
- 74731806 Adding man pages to Red Hat spec file
|
|
||||||
- 758d333d Removing blocking test from yaml configuration file
|
|
||||||
- c7e7c59c Changing permission of cloud-init-generator to 755
|
|
||||||
- 8b85abbb Installing man pages in the correct place with correct permissions
|
|
||||||
- c6808d8d Fix unit failure of cloud-final.service if NetworkManager was not present.
|
|
||||||
- 11866ef6 Report full specific version with "cloud-init --version"
|
|
||||||
|
|
||||||
Rebase notes (18.5):
|
|
||||||
- added bash_completition file
|
|
||||||
- added cloud-id file
|
|
||||||
|
|
||||||
Merged patches (20.3):
|
|
||||||
- 01900d0 changing ds-identify patch from /usr/lib to /usr/libexec
|
|
||||||
- 7f47ca3 Render the generator from template instead of cp
|
|
||||||
|
|
||||||
Merged patches (19.4):
|
|
||||||
- 4ab5a61 Fix for network configuration not persisting after reboot
|
|
||||||
- 84cf125 Removing cloud-user from wheel
|
|
||||||
- 31290ab Adding gating tests for Azure, ESXi and AWS
|
|
||||||
|
|
||||||
Merged patches (18.5):
|
|
||||||
- 2d6b469 add power-state-change module to cloud_final_modules
|
|
||||||
- 764159f Adding systemd mount options to wait for cloud-init
|
|
||||||
- da4d99e Adding disk_setup to rhel/cloud.cfg
|
|
||||||
- f5c6832 Enable cloud-init by default on vmware
|
|
||||||
|
|
||||||
Conflicts:
|
|
||||||
cloudinit/config/cc_chef.py:
|
|
||||||
- Updated header documentation text
|
|
||||||
- Replacing double quotes by simple quotes
|
|
||||||
|
|
||||||
setup.py:
|
|
||||||
- Adding missing cmdclass info
|
|
||||||
|
|
||||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
---
|
|
||||||
.gitignore | 1 +
|
|
||||||
cloudinit/config/cc_chef.py | 67 +++-
|
|
||||||
cloudinit/settings.py | 7 +-
|
|
||||||
redhat/.gitignore | 1 +
|
|
||||||
redhat/Makefile | 71 ++++
|
|
||||||
redhat/Makefile.common | 37 ++
|
|
||||||
redhat/cloud-init-tmpfiles.conf | 1 +
|
|
||||||
redhat/cloud-init.spec.template | 530 ++++++++++++++++++++++++++
|
|
||||||
redhat/gating.yaml | 8 +
|
|
||||||
redhat/rpmbuild/BUILD/.gitignore | 3 +
|
|
||||||
redhat/rpmbuild/RPMS/.gitignore | 3 +
|
|
||||||
redhat/rpmbuild/SOURCES/.gitignore | 3 +
|
|
||||||
redhat/rpmbuild/SPECS/.gitignore | 3 +
|
|
||||||
redhat/rpmbuild/SRPMS/.gitignore | 3 +
|
|
||||||
redhat/scripts/frh.py | 27 ++
|
|
||||||
redhat/scripts/git-backport-diff | 327 ++++++++++++++++
|
|
||||||
redhat/scripts/git-compile-check | 215 +++++++++++
|
|
||||||
redhat/scripts/process-patches.sh | 77 ++++
|
|
||||||
redhat/scripts/tarball_checksum.sh | 3 +
|
|
||||||
rhel/README.rhel | 5 +
|
|
||||||
rhel/cloud-init-tmpfiles.conf | 1 +
|
|
||||||
rhel/cloud.cfg | 69 ++++
|
|
||||||
rhel/systemd/cloud-config.service | 18 +
|
|
||||||
rhel/systemd/cloud-config.target | 11 +
|
|
||||||
rhel/systemd/cloud-final.service | 24 ++
|
|
||||||
rhel/systemd/cloud-init-local.service | 31 ++
|
|
||||||
rhel/systemd/cloud-init.service | 25 ++
|
|
||||||
rhel/systemd/cloud-init.target | 7 +
|
|
||||||
setup.py | 23 +-
|
|
||||||
tools/read-version | 28 +-
|
|
||||||
30 files changed, 1579 insertions(+), 50 deletions(-)
|
|
||||||
create mode 100644 redhat/.gitignore
|
|
||||||
create mode 100644 redhat/Makefile
|
|
||||||
create mode 100644 redhat/Makefile.common
|
|
||||||
create mode 100644 redhat/cloud-init-tmpfiles.conf
|
|
||||||
create mode 100644 redhat/cloud-init.spec.template
|
|
||||||
create mode 100644 redhat/gating.yaml
|
|
||||||
create mode 100644 redhat/rpmbuild/BUILD/.gitignore
|
|
||||||
create mode 100644 redhat/rpmbuild/RPMS/.gitignore
|
|
||||||
create mode 100644 redhat/rpmbuild/SOURCES/.gitignore
|
|
||||||
create mode 100644 redhat/rpmbuild/SPECS/.gitignore
|
|
||||||
create mode 100644 redhat/rpmbuild/SRPMS/.gitignore
|
|
||||||
create mode 100755 redhat/scripts/frh.py
|
|
||||||
create mode 100755 redhat/scripts/git-backport-diff
|
|
||||||
create mode 100755 redhat/scripts/git-compile-check
|
|
||||||
create mode 100755 redhat/scripts/process-patches.sh
|
|
||||||
create mode 100755 redhat/scripts/tarball_checksum.sh
|
|
||||||
create mode 100644 rhel/README.rhel
|
|
||||||
create mode 100644 rhel/cloud-init-tmpfiles.conf
|
|
||||||
create mode 100644 rhel/cloud.cfg
|
|
||||||
create mode 100644 rhel/systemd/cloud-config.service
|
|
||||||
create mode 100644 rhel/systemd/cloud-config.target
|
|
||||||
create mode 100644 rhel/systemd/cloud-final.service
|
|
||||||
create mode 100644 rhel/systemd/cloud-init-local.service
|
|
||||||
create mode 100644 rhel/systemd/cloud-init.service
|
|
||||||
create mode 100644 rhel/systemd/cloud-init.target
|
|
||||||
|
|
||||||
diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
|
|
||||||
index aaf71366..97ef649a 100644
|
|
||||||
--- a/cloudinit/config/cc_chef.py
|
|
||||||
+++ b/cloudinit/config/cc_chef.py
|
|
||||||
@@ -6,7 +6,70 @@
|
|
||||||
#
|
|
||||||
# This file is part of cloud-init. See LICENSE file for license information.
|
|
||||||
|
|
||||||
-"""Chef: module that configures, starts and installs chef."""
|
|
||||||
+"""
|
|
||||||
+Chef
|
|
||||||
+----
|
|
||||||
+**Summary:** module that configures, starts and installs chef.
|
|
||||||
+
|
|
||||||
+This module enables chef to be installed (from packages or
|
|
||||||
+from gems, or from omnibus). Before this occurs chef configurations are
|
|
||||||
+written to disk (validation.pem, client.pem, firstboot.json, client.rb),
|
|
||||||
+and needed chef folders/directories are created (/etc/chef and /var/log/chef
|
|
||||||
+and so-on). Then once installing proceeds correctly if configured chef will
|
|
||||||
+be started (in daemon mode or in non-daemon mode) and then once that has
|
|
||||||
+finished (if ran in non-daemon mode this will be when chef finishes
|
|
||||||
+converging, if ran in daemon mode then no further actions are possible since
|
|
||||||
+chef will have forked into its own process) then a post run function can
|
|
||||||
+run that can do finishing activities (such as removing the validation pem
|
|
||||||
+file).
|
|
||||||
+
|
|
||||||
+**Internal name:** ``cc_chef``
|
|
||||||
+
|
|
||||||
+**Module frequency:** per always
|
|
||||||
+
|
|
||||||
+**Supported distros:** all
|
|
||||||
+
|
|
||||||
+**Config keys**::
|
|
||||||
+
|
|
||||||
+ chef:
|
|
||||||
+ directories: (defaulting to /etc/chef, /var/log/chef, /var/lib/chef,
|
|
||||||
+ /var/cache/chef, /var/backups/chef, /run/chef)
|
|
||||||
+ validation_cert: (optional string to be written to file validation_key)
|
|
||||||
+ special value 'system' means set use existing file
|
|
||||||
+ validation_key: (optional the path for validation_cert. default
|
|
||||||
+ /etc/chef/validation.pem)
|
|
||||||
+ firstboot_path: (path to write run_list and initial_attributes keys that
|
|
||||||
+ should also be present in this configuration, defaults
|
|
||||||
+ to /etc/chef/firstboot.json)
|
|
||||||
+ exec: boolean to run or not run chef (defaults to false, unless
|
|
||||||
+ a gem installed is requested
|
|
||||||
+ where this will then default
|
|
||||||
+ to true)
|
|
||||||
+
|
|
||||||
+ chef.rb template keys (if falsey, then will be skipped and not
|
|
||||||
+ written to /etc/chef/client.rb)
|
|
||||||
+
|
|
||||||
+ chef:
|
|
||||||
+ client_key:
|
|
||||||
+ encrypted_data_bag_secret:
|
|
||||||
+ environment:
|
|
||||||
+ file_backup_path:
|
|
||||||
+ file_cache_path:
|
|
||||||
+ json_attribs:
|
|
||||||
+ log_level:
|
|
||||||
+ log_location:
|
|
||||||
+ node_name:
|
|
||||||
+ omnibus_url:
|
|
||||||
+ omnibus_url_retries:
|
|
||||||
+ omnibus_version:
|
|
||||||
+ pid_file:
|
|
||||||
+ server_url:
|
|
||||||
+ show_time:
|
|
||||||
+ ssl_verify_mode:
|
|
||||||
+ validation_cert:
|
|
||||||
+ validation_key:
|
|
||||||
+ validation_name:
|
|
||||||
+"""
|
|
||||||
|
|
||||||
import itertools
|
|
||||||
import json
|
|
||||||
@@ -31,7 +94,7 @@ CHEF_DIRS = tuple([
|
|
||||||
'/var/lib/chef',
|
|
||||||
'/var/cache/chef',
|
|
||||||
'/var/backups/chef',
|
|
||||||
- '/var/run/chef',
|
|
||||||
+ '/run/chef',
|
|
||||||
])
|
|
||||||
REQUIRED_CHEF_DIRS = tuple([
|
|
||||||
'/etc/chef',
|
|
||||||
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
|
|
||||||
index 91e1bfe7..e690c0fd 100644
|
|
||||||
--- a/cloudinit/settings.py
|
|
||||||
+++ b/cloudinit/settings.py
|
|
||||||
@@ -47,13 +47,16 @@ CFG_BUILTIN = {
|
|
||||||
],
|
|
||||||
'def_log_file': '/var/log/cloud-init.log',
|
|
||||||
'log_cfgs': [],
|
|
||||||
- 'syslog_fix_perms': ['syslog:adm', 'root:adm', 'root:wheel', 'root:root'],
|
|
||||||
+ 'mount_default_fields': [None, None, 'auto', 'defaults,nofail', '0', '2'],
|
|
||||||
+ 'ssh_deletekeys': False,
|
|
||||||
+ 'ssh_genkeytypes': [],
|
|
||||||
+ 'syslog_fix_perms': [],
|
|
||||||
'system_info': {
|
|
||||||
'paths': {
|
|
||||||
'cloud_dir': '/var/lib/cloud',
|
|
||||||
'templates_dir': '/etc/cloud/templates/',
|
|
||||||
},
|
|
||||||
- 'distro': 'ubuntu',
|
|
||||||
+ 'distro': 'rhel',
|
|
||||||
'network': {'renderers': None},
|
|
||||||
},
|
|
||||||
'vendor_data': {'enabled': True, 'prefix': []},
|
|
||||||
diff --git a/rhel/README.rhel b/rhel/README.rhel
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..aa29630d
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/rhel/README.rhel
|
|
||||||
@@ -0,0 +1,5 @@
|
|
||||||
+The following cloud-init modules are currently unsupported on this OS:
|
|
||||||
+ - apt_update_upgrade ('apt_update', 'apt_upgrade', 'apt_mirror', 'apt_preserve_sources_list', 'apt_old_mirror', 'apt_sources', 'debconf_selections', 'packages' options)
|
|
||||||
+ - byobu ('byobu_by_default' option)
|
|
||||||
+ - chef
|
|
||||||
+ - grub_dpkg
|
|
||||||
diff --git a/rhel/cloud-init-tmpfiles.conf b/rhel/cloud-init-tmpfiles.conf
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..0c6d2a3b
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/rhel/cloud-init-tmpfiles.conf
|
|
||||||
@@ -0,0 +1 @@
|
|
||||||
+d /run/cloud-init 0700 root root - -
|
|
||||||
diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..82e8bf62
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/rhel/cloud.cfg
|
|
||||||
@@ -0,0 +1,69 @@
|
|
||||||
+users:
|
|
||||||
+ - default
|
|
||||||
+
|
|
||||||
+disable_root: 1
|
|
||||||
+ssh_pwauth: 0
|
|
||||||
+
|
|
||||||
+mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service', '0', '2']
|
|
||||||
+resize_rootfs_tmp: /dev
|
|
||||||
+ssh_deletekeys: 0
|
|
||||||
+ssh_genkeytypes: ~
|
|
||||||
+syslog_fix_perms: ~
|
|
||||||
+disable_vmware_customization: false
|
|
||||||
+
|
|
||||||
+cloud_init_modules:
|
|
||||||
+ - disk_setup
|
|
||||||
+ - migrator
|
|
||||||
+ - bootcmd
|
|
||||||
+ - write-files
|
|
||||||
+ - growpart
|
|
||||||
+ - resizefs
|
|
||||||
+ - set_hostname
|
|
||||||
+ - update_hostname
|
|
||||||
+ - update_etc_hosts
|
|
||||||
+ - rsyslog
|
|
||||||
+ - users-groups
|
|
||||||
+ - ssh
|
|
||||||
+
|
|
||||||
+cloud_config_modules:
|
|
||||||
+ - mounts
|
|
||||||
+ - locale
|
|
||||||
+ - set-passwords
|
|
||||||
+ - rh_subscription
|
|
||||||
+ - yum-add-repo
|
|
||||||
+ - package-update-upgrade-install
|
|
||||||
+ - timezone
|
|
||||||
+ - puppet
|
|
||||||
+ - chef
|
|
||||||
+ - salt-minion
|
|
||||||
+ - mcollective
|
|
||||||
+ - disable-ec2-metadata
|
|
||||||
+ - runcmd
|
|
||||||
+
|
|
||||||
+cloud_final_modules:
|
|
||||||
+ - rightscale_userdata
|
|
||||||
+ - scripts-per-once
|
|
||||||
+ - scripts-per-boot
|
|
||||||
+ - scripts-per-instance
|
|
||||||
+ - scripts-user
|
|
||||||
+ - ssh-authkey-fingerprints
|
|
||||||
+ - keys-to-console
|
|
||||||
+ - phone-home
|
|
||||||
+ - final-message
|
|
||||||
+ - power-state-change
|
|
||||||
+
|
|
||||||
+system_info:
|
|
||||||
+ default_user:
|
|
||||||
+ name: cloud-user
|
|
||||||
+ lock_passwd: true
|
|
||||||
+ gecos: Cloud User
|
|
||||||
+ groups: [adm, systemd-journal]
|
|
||||||
+ sudo: ["ALL=(ALL) NOPASSWD:ALL"]
|
|
||||||
+ shell: /bin/bash
|
|
||||||
+ distro: rhel
|
|
||||||
+ paths:
|
|
||||||
+ cloud_dir: /var/lib/cloud
|
|
||||||
+ templates_dir: /etc/cloud/templates
|
|
||||||
+ ssh_svcname: sshd
|
|
||||||
+
|
|
||||||
+# vim:syntax=yaml
|
|
||||||
diff --git a/rhel/systemd/cloud-config.service b/rhel/systemd/cloud-config.service
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..f3dcd4be
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/rhel/systemd/cloud-config.service
|
|
||||||
@@ -0,0 +1,18 @@
|
|
||||||
+[Unit]
|
|
||||||
+Description=Apply the settings specified in cloud-config
|
|
||||||
+After=network-online.target cloud-config.target
|
|
||||||
+Wants=network-online.target cloud-config.target
|
|
||||||
+ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
|
||||||
+ConditionKernelCommandLine=!cloud-init=disabled
|
|
||||||
+
|
|
||||||
+[Service]
|
|
||||||
+Type=oneshot
|
|
||||||
+ExecStart=/usr/bin/cloud-init modules --mode=config
|
|
||||||
+RemainAfterExit=yes
|
|
||||||
+TimeoutSec=0
|
|
||||||
+
|
|
||||||
+# Output needs to appear in instance console output
|
|
||||||
+StandardOutput=journal+console
|
|
||||||
+
|
|
||||||
+[Install]
|
|
||||||
+WantedBy=cloud-init.target
|
|
||||||
diff --git a/rhel/systemd/cloud-config.target b/rhel/systemd/cloud-config.target
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..ae9b7d02
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/rhel/systemd/cloud-config.target
|
|
||||||
@@ -0,0 +1,11 @@
|
|
||||||
+# cloud-init normally emits a "cloud-config" upstart event to inform third
|
|
||||||
+# parties that cloud-config is available, which does us no good when we're
|
|
||||||
+# using systemd. cloud-config.target serves as this synchronization point
|
|
||||||
+# instead. Services that would "start on cloud-config" with upstart can
|
|
||||||
+# instead use "After=cloud-config.target" and "Wants=cloud-config.target"
|
|
||||||
+# as appropriate.
|
|
||||||
+
|
|
||||||
+[Unit]
|
|
||||||
+Description=Cloud-config availability
|
|
||||||
+Wants=cloud-init-local.service cloud-init.service
|
|
||||||
+After=cloud-init-local.service cloud-init.service
|
|
||||||
diff --git a/rhel/systemd/cloud-final.service b/rhel/systemd/cloud-final.service
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..e281c0cf
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/rhel/systemd/cloud-final.service
|
|
||||||
@@ -0,0 +1,24 @@
|
|
||||||
+[Unit]
|
|
||||||
+Description=Execute cloud user/final scripts
|
|
||||||
+After=network-online.target cloud-config.service rc-local.service
|
|
||||||
+Wants=network-online.target cloud-config.service
|
|
||||||
+ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
|
||||||
+ConditionKernelCommandLine=!cloud-init=disabled
|
|
||||||
+
|
|
||||||
+[Service]
|
|
||||||
+Type=oneshot
|
|
||||||
+ExecStart=/usr/bin/cloud-init modules --mode=final
|
|
||||||
+RemainAfterExit=yes
|
|
||||||
+TimeoutSec=0
|
|
||||||
+KillMode=process
|
|
||||||
+# Restart NetworkManager if it is present and running.
|
|
||||||
+ExecStartPost=/bin/sh -c 'u=NetworkManager.service; \
|
|
||||||
+ out=$(systemctl show --property=SubState $u) || exit; \
|
|
||||||
+ [ "$out" = "SubState=running" ] || exit 0; \
|
|
||||||
+ systemctl reload-or-try-restart $u'
|
|
||||||
+
|
|
||||||
+# Output needs to appear in instance console output
|
|
||||||
+StandardOutput=journal+console
|
|
||||||
+
|
|
||||||
+[Install]
|
|
||||||
+WantedBy=cloud-init.target
|
|
||||||
diff --git a/rhel/systemd/cloud-init-local.service b/rhel/systemd/cloud-init-local.service
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..8f9f6c9f
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/rhel/systemd/cloud-init-local.service
|
|
||||||
@@ -0,0 +1,31 @@
|
|
||||||
+[Unit]
|
|
||||||
+Description=Initial cloud-init job (pre-networking)
|
|
||||||
+DefaultDependencies=no
|
|
||||||
+Wants=network-pre.target
|
|
||||||
+After=systemd-remount-fs.service
|
|
||||||
+Requires=dbus.socket
|
|
||||||
+After=dbus.socket
|
|
||||||
+Before=NetworkManager.service network.service
|
|
||||||
+Before=network-pre.target
|
|
||||||
+Before=shutdown.target
|
|
||||||
+Before=firewalld.target
|
|
||||||
+Conflicts=shutdown.target
|
|
||||||
+RequiresMountsFor=/var/lib/cloud
|
|
||||||
+ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
|
||||||
+ConditionKernelCommandLine=!cloud-init=disabled
|
|
||||||
+
|
|
||||||
+[Service]
|
|
||||||
+Type=oneshot
|
|
||||||
+ExecStartPre=/bin/mkdir -p /run/cloud-init
|
|
||||||
+ExecStartPre=/sbin/restorecon /run/cloud-init
|
|
||||||
+ExecStartPre=/usr/bin/touch /run/cloud-init/enabled
|
|
||||||
+ExecStart=/usr/bin/cloud-init init --local
|
|
||||||
+ExecStart=/bin/touch /run/cloud-init/network-config-ready
|
|
||||||
+RemainAfterExit=yes
|
|
||||||
+TimeoutSec=0
|
|
||||||
+
|
|
||||||
+# Output needs to appear in instance console output
|
|
||||||
+StandardOutput=journal+console
|
|
||||||
+
|
|
||||||
+[Install]
|
|
||||||
+WantedBy=cloud-init.target
|
|
||||||
diff --git a/rhel/systemd/cloud-init.service b/rhel/systemd/cloud-init.service
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..d0023a05
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/rhel/systemd/cloud-init.service
|
|
||||||
@@ -0,0 +1,25 @@
|
|
||||||
+[Unit]
|
|
||||||
+Description=Initial cloud-init job (metadata service crawler)
|
|
||||||
+Wants=cloud-init-local.service
|
|
||||||
+Wants=sshd-keygen.service
|
|
||||||
+Wants=sshd.service
|
|
||||||
+After=cloud-init-local.service
|
|
||||||
+After=NetworkManager.service network.service
|
|
||||||
+Before=network-online.target
|
|
||||||
+Before=sshd-keygen.service
|
|
||||||
+Before=sshd.service
|
|
||||||
+Before=systemd-user-sessions.service
|
|
||||||
+ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
|
||||||
+ConditionKernelCommandLine=!cloud-init=disabled
|
|
||||||
+
|
|
||||||
+[Service]
|
|
||||||
+Type=oneshot
|
|
||||||
+ExecStart=/usr/bin/cloud-init init
|
|
||||||
+RemainAfterExit=yes
|
|
||||||
+TimeoutSec=0
|
|
||||||
+
|
|
||||||
+# Output needs to appear in instance console output
|
|
||||||
+StandardOutput=journal+console
|
|
||||||
+
|
|
||||||
+[Install]
|
|
||||||
+WantedBy=cloud-init.target
|
|
||||||
diff --git a/rhel/systemd/cloud-init.target b/rhel/systemd/cloud-init.target
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..083c3b6f
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/rhel/systemd/cloud-init.target
|
|
||||||
@@ -0,0 +1,7 @@
|
|
||||||
+# cloud-init target is enabled by cloud-init-generator
|
|
||||||
+# To disable it you can either:
|
|
||||||
+# a.) boot with kernel cmdline of 'cloud-init=disabled'
|
|
||||||
+# b.) touch a file /etc/cloud/cloud-init.disabled
|
|
||||||
+[Unit]
|
|
||||||
+Description=Cloud-init target
|
|
||||||
+After=multi-user.target
|
|
||||||
diff --git a/setup.py b/setup.py
|
|
||||||
index cbacf48e..d5cd01a4 100755
|
|
||||||
--- a/setup.py
|
|
||||||
+++ b/setup.py
|
|
||||||
@@ -125,14 +125,6 @@ INITSYS_FILES = {
|
|
||||||
'sysvinit_deb': [f for f in glob('sysvinit/debian/*') if is_f(f)],
|
|
||||||
'sysvinit_openrc': [f for f in glob('sysvinit/gentoo/*') if is_f(f)],
|
|
||||||
'sysvinit_suse': [f for f in glob('sysvinit/suse/*') if is_f(f)],
|
|
||||||
- 'systemd': [render_tmpl(f)
|
|
||||||
- for f in (glob('systemd/*.tmpl') +
|
|
||||||
- glob('systemd/*.service') +
|
|
||||||
- glob('systemd/*.target'))
|
|
||||||
- if (is_f(f) and not is_generator(f))],
|
|
||||||
- 'systemd.generators': [
|
|
||||||
- render_tmpl(f, mode=0o755)
|
|
||||||
- for f in glob('systemd/*') if is_f(f) and is_generator(f)],
|
|
||||||
'upstart': [f for f in glob('upstart/*') if is_f(f)],
|
|
||||||
}
|
|
||||||
INITSYS_ROOTS = {
|
|
||||||
@@ -142,9 +134,6 @@ INITSYS_ROOTS = {
|
|
||||||
'sysvinit_deb': 'etc/init.d',
|
|
||||||
'sysvinit_openrc': 'etc/init.d',
|
|
||||||
'sysvinit_suse': 'etc/init.d',
|
|
||||||
- 'systemd': pkg_config_read('systemd', 'systemdsystemunitdir'),
|
|
||||||
- 'systemd.generators': pkg_config_read('systemd',
|
|
||||||
- 'systemdsystemgeneratordir'),
|
|
||||||
'upstart': 'etc/init/',
|
|
||||||
}
|
|
||||||
INITSYS_TYPES = sorted([f.partition(".")[0] for f in INITSYS_ROOTS.keys()])
|
|
||||||
@@ -245,14 +234,11 @@ if not in_virtualenv():
|
|
||||||
INITSYS_ROOTS[k] = "/" + INITSYS_ROOTS[k]
|
|
||||||
|
|
||||||
data_files = [
|
|
||||||
- (ETC + '/cloud', [render_tmpl("config/cloud.cfg.tmpl")]),
|
|
||||||
+ (ETC + '/bash_completion.d', ['bash_completion/cloud-init']),
|
|
||||||
(ETC + '/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')),
|
|
||||||
(ETC + '/cloud/templates', glob('templates/*')),
|
|
||||||
- (USR_LIB_EXEC + '/cloud-init', ['tools/ds-identify',
|
|
||||||
- 'tools/uncloud-init',
|
|
||||||
+ (USR_LIB_EXEC + '/cloud-init', ['tools/uncloud-init',
|
|
||||||
'tools/write-ssh-key-fingerprints']),
|
|
||||||
- (USR + '/share/bash-completion/completions',
|
|
||||||
- ['bash_completion/cloud-init']),
|
|
||||||
(USR + '/share/doc/cloud-init', [f for f in glob('doc/*') if is_f(f)]),
|
|
||||||
(USR + '/share/doc/cloud-init/examples',
|
|
||||||
[f for f in glob('doc/examples/*') if is_f(f)]),
|
|
||||||
@@ -263,8 +249,7 @@ if not platform.system().endswith('BSD'):
|
|
||||||
data_files.extend([
|
|
||||||
(ETC + '/NetworkManager/dispatcher.d/',
|
|
||||||
['tools/hook-network-manager']),
|
|
||||||
- (ETC + '/dhcp/dhclient-exit-hooks.d/', ['tools/hook-dhclient']),
|
|
||||||
- (LIB + '/udev/rules.d', [f for f in glob('udev/*.rules')])
|
|
||||||
+ ('/usr/lib/udev/rules.d', [f for f in glob('udev/*.rules')])
|
|
||||||
])
|
|
||||||
# Use a subclass for install that handles
|
|
||||||
# adding on the right init system configuration files
|
|
||||||
@@ -286,8 +271,6 @@ setuptools.setup(
|
|
||||||
scripts=['tools/cloud-init-per'],
|
|
||||||
license='Dual-licensed under GPLv3 or Apache 2.0',
|
|
||||||
data_files=data_files,
|
|
||||||
- install_requires=requirements,
|
|
||||||
- cmdclass=cmdclass,
|
|
||||||
entry_points={
|
|
||||||
'console_scripts': [
|
|
||||||
'cloud-init = cloudinit.cmd.main:main',
|
|
||||||
diff --git a/tools/read-version b/tools/read-version
|
|
||||||
index 02c90643..79755f78 100755
|
|
||||||
--- a/tools/read-version
|
|
||||||
+++ b/tools/read-version
|
|
||||||
@@ -71,32 +71,8 @@ version_long = None
|
|
||||||
is_release_branch_ci = (
|
|
||||||
os.environ.get("TRAVIS_PULL_REQUEST_BRANCH", "").startswith("upstream/")
|
|
||||||
)
|
|
||||||
-if is_gitdir(_tdir) and which("git") and not is_release_branch_ci:
|
|
||||||
- flags = []
|
|
||||||
- if use_tags:
|
|
||||||
- flags = ['--tags']
|
|
||||||
- cmd = ['git', 'describe', '--abbrev=8', '--match=[0-9]*'] + flags
|
|
||||||
-
|
|
||||||
- try:
|
|
||||||
- version = tiny_p(cmd).strip()
|
|
||||||
- except RuntimeError:
|
|
||||||
- version = None
|
|
||||||
-
|
|
||||||
- if version is None or not version.startswith(src_version):
|
|
||||||
- sys.stderr.write("git describe version (%s) differs from "
|
|
||||||
- "cloudinit.version (%s)\n" % (version, src_version))
|
|
||||||
- sys.stderr.write(
|
|
||||||
- "Please get the latest upstream tags.\n"
|
|
||||||
- "As an example, this can be done with the following:\n"
|
|
||||||
- "$ git remote add upstream https://git.launchpad.net/cloud-init\n"
|
|
||||||
- "$ git fetch upstream --tags\n"
|
|
||||||
- )
|
|
||||||
- sys.exit(1)
|
|
||||||
-
|
|
||||||
- version_long = tiny_p(cmd + ["--long"]).strip()
|
|
||||||
-else:
|
|
||||||
- version = src_version
|
|
||||||
- version_long = None
|
|
||||||
+version = src_version
|
|
||||||
+version_long = None
|
|
||||||
|
|
||||||
# version is X.Y.Z[+xxx.gHASH]
|
|
||||||
# version_long is None or X.Y.Z-xxx-gHASH
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
|
@ -1,262 +0,0 @@
|
||||||
From 472c2b5d4342b6ab6ce1584dc39bed0e6c1ca2e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Date: Fri, 7 May 2021 13:36:06 +0200
|
|
||||||
Subject: Do not write NM_CONTROLLED=no in generated interface config files
|
|
||||||
|
|
||||||
Conflicts 20.3:
|
|
||||||
- Not appplying patch on cloudinit/net/sysconfig.py since it now has a
|
|
||||||
mechanism to identify if cloud-init is running on RHEL, having the
|
|
||||||
correct settings for NM_CONTROLLED.
|
|
||||||
|
|
||||||
X-downstream-only: true
|
|
||||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
|
|
||||||
---
|
|
||||||
cloudinit/net/sysconfig.py | 2 +-
|
|
||||||
tests/unittests/test_net.py | 28 ----------------------------
|
|
||||||
2 files changed, 1 insertion(+), 29 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
|
||||||
index 99a4bae4..3d276666 100644
|
|
||||||
--- a/cloudinit/net/sysconfig.py
|
|
||||||
+++ b/cloudinit/net/sysconfig.py
|
|
||||||
@@ -289,7 +289,7 @@ class Renderer(renderer.Renderer):
|
|
||||||
# details about this)
|
|
||||||
|
|
||||||
iface_defaults = {
|
|
||||||
- 'rhel': {'ONBOOT': True, 'USERCTL': False, 'NM_CONTROLLED': False,
|
|
||||||
+ 'rhel': {'ONBOOT': True, 'USERCTL': False,
|
|
||||||
'BOOTPROTO': 'none'},
|
|
||||||
'suse': {'BOOTPROTO': 'static', 'STARTMODE': 'auto'},
|
|
||||||
}
|
|
||||||
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
|
||||||
index 38d934d4..c67b5fcc 100644
|
|
||||||
--- a/tests/unittests/test_net.py
|
|
||||||
+++ b/tests/unittests/test_net.py
|
|
||||||
@@ -535,7 +535,6 @@ GATEWAY=172.19.3.254
|
|
||||||
HWADDR=fa:16:3e:ed:9a:59
|
|
||||||
IPADDR=172.19.1.34
|
|
||||||
NETMASK=255.255.252.0
|
|
||||||
-NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no
|
|
||||||
@@ -633,7 +632,6 @@ IPADDR=172.19.1.34
|
|
||||||
IPADDR1=10.0.0.10
|
|
||||||
NETMASK=255.255.252.0
|
|
||||||
NETMASK1=255.255.255.0
|
|
||||||
-NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no
|
|
||||||
@@ -756,7 +754,6 @@ IPV6_AUTOCONF=no
|
|
||||||
IPV6_DEFAULTGW=2001:DB8::1
|
|
||||||
IPV6_FORCE_ACCEPT_RA=no
|
|
||||||
NETMASK=255.255.252.0
|
|
||||||
-NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no
|
|
||||||
@@ -884,7 +881,6 @@ NETWORK_CONFIGS = {
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eth1
|
|
||||||
HWADDR=cf:d6:af:48:e8:80
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no"""),
|
|
||||||
@@ -901,7 +897,6 @@ NETWORK_CONFIGS = {
|
|
||||||
IPADDR=192.168.21.3
|
|
||||||
NETMASK=255.255.255.0
|
|
||||||
METRIC=10000
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no"""),
|
|
||||||
@@ -1032,7 +1027,6 @@ NETWORK_CONFIGS = {
|
|
||||||
IPV6_AUTOCONF=no
|
|
||||||
IPV6_FORCE_ACCEPT_RA=no
|
|
||||||
NETMASK=255.255.255.0
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no
|
|
||||||
@@ -1737,7 +1731,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
DHCPV6C=yes
|
|
||||||
IPV6INIT=yes
|
|
||||||
MACADDR=aa:bb:cc:dd:ee:ff
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Bond
|
|
||||||
USERCTL=no"""),
|
|
||||||
@@ -1745,7 +1738,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEVICE=bond0.200
|
|
||||||
DHCLIENT_SET_DEFAULT_ROUTE=no
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
PHYSDEV=bond0
|
|
||||||
USERCTL=no
|
|
||||||
@@ -1763,7 +1755,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
IPV6_DEFAULTGW=2001:4800:78ff:1b::1
|
|
||||||
MACADDR=bb:bb:bb:bb:bb:aa
|
|
||||||
NETMASK=255.255.255.0
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
PRIO=22
|
|
||||||
STP=no
|
|
||||||
@@ -1773,7 +1764,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eth0
|
|
||||||
HWADDR=c0:d6:9f:2c:e8:80
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no"""),
|
|
||||||
@@ -1790,7 +1780,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
MTU=1500
|
|
||||||
NETMASK=255.255.255.0
|
|
||||||
NETMASK1=255.255.255.0
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
PHYSDEV=eth0
|
|
||||||
USERCTL=no
|
|
||||||
@@ -1800,7 +1789,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
DEVICE=eth1
|
|
||||||
HWADDR=aa:d6:9f:2c:e8:80
|
|
||||||
MASTER=bond0
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
SLAVE=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
@@ -1810,7 +1798,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
DEVICE=eth2
|
|
||||||
HWADDR=c0:bb:9f:2c:e8:80
|
|
||||||
MASTER=bond0
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
SLAVE=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
@@ -1820,7 +1807,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
BRIDGE=br0
|
|
||||||
DEVICE=eth3
|
|
||||||
HWADDR=66:bb:9f:2c:e8:80
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no"""),
|
|
||||||
@@ -1829,7 +1815,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
BRIDGE=br0
|
|
||||||
DEVICE=eth4
|
|
||||||
HWADDR=98:bb:9f:2c:e8:80
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no"""),
|
|
||||||
@@ -1838,7 +1823,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
DEVICE=eth5
|
|
||||||
DHCLIENT_SET_DEFAULT_ROUTE=no
|
|
||||||
HWADDR=98:bb:9f:2c:e8:8a
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=no
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no"""),
|
|
||||||
@@ -2294,7 +2278,6 @@ iface bond0 inet6 static
|
|
||||||
MTU=9000
|
|
||||||
NETMASK=255.255.255.0
|
|
||||||
NETMASK1=255.255.255.0
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Bond
|
|
||||||
USERCTL=no
|
|
||||||
@@ -2304,7 +2287,6 @@ iface bond0 inet6 static
|
|
||||||
DEVICE=bond0s0
|
|
||||||
HWADDR=aa:bb:cc:dd:e8:00
|
|
||||||
MASTER=bond0
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
SLAVE=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
@@ -2326,7 +2308,6 @@ iface bond0 inet6 static
|
|
||||||
DEVICE=bond0s1
|
|
||||||
HWADDR=aa:bb:cc:dd:e8:01
|
|
||||||
MASTER=bond0
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
SLAVE=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
@@ -2383,7 +2364,6 @@ iface bond0 inet6 static
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=en0
|
|
||||||
HWADDR=aa:bb:cc:dd:e8:00
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no"""),
|
|
||||||
@@ -2402,7 +2382,6 @@ iface bond0 inet6 static
|
|
||||||
MTU=2222
|
|
||||||
NETMASK=255.255.255.0
|
|
||||||
NETMASK1=255.255.255.0
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
PHYSDEV=en0
|
|
||||||
USERCTL=no
|
|
||||||
@@ -2467,7 +2446,6 @@ iface bond0 inet6 static
|
|
||||||
DEVICE=br0
|
|
||||||
IPADDR=192.168.2.2
|
|
||||||
NETMASK=255.255.255.0
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
PRIO=22
|
|
||||||
STP=no
|
|
||||||
@@ -2591,7 +2569,6 @@ iface bond0 inet6 static
|
|
||||||
HWADDR=52:54:00:12:34:00
|
|
||||||
IPADDR=192.168.1.2
|
|
||||||
NETMASK=255.255.255.0
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=no
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no
|
|
||||||
@@ -2601,7 +2578,6 @@ iface bond0 inet6 static
|
|
||||||
DEVICE=eth1
|
|
||||||
HWADDR=52:54:00:12:34:aa
|
|
||||||
MTU=1480
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no
|
|
||||||
@@ -2610,7 +2586,6 @@ iface bond0 inet6 static
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=eth2
|
|
||||||
HWADDR=52:54:00:12:34:ff
|
|
||||||
- NM_CONTROLLED=no
|
|
||||||
ONBOOT=no
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no
|
|
||||||
@@ -3027,7 +3002,6 @@ class TestRhelSysConfigRendering(CiTestCase):
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEVICE=eth1000
|
|
||||||
HWADDR=07-1c-c6-75-a4-be
|
|
||||||
-NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no
|
|
||||||
@@ -3148,7 +3122,6 @@ GATEWAY=10.0.2.2
|
|
||||||
HWADDR=52:54:00:12:34:00
|
|
||||||
IPADDR=10.0.2.15
|
|
||||||
NETMASK=255.255.255.0
|
|
||||||
-NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no
|
|
||||||
@@ -3218,7 +3191,6 @@ USERCTL=no
|
|
||||||
#
|
|
||||||
BOOTPROTO=dhcp
|
|
||||||
DEVICE=eth0
|
|
||||||
-NM_CONTROLLED=no
|
|
||||||
ONBOOT=yes
|
|
||||||
TYPE=Ethernet
|
|
||||||
USERCTL=no
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
|
@ -0,0 +1,550 @@
|
||||||
|
From 2d3a22bd5b36c20b53f1604e9ff6ce05c98753ec Mon Sep 17 00:00:00 2001
|
||||||
|
From: Cathy Avery <cavery@redhat.com>
|
||||||
|
Date: Mon, 18 Dec 2023 12:54:16 -0500
|
||||||
|
Subject: Do not write NM_CONTROLLED=no in generated interface config files
|
||||||
|
|
||||||
|
Squashed from:
|
||||||
|
From 3ee57b044d2b85d8172961258d2edeab82a43772 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Eduardo Otubo <otubo@redhat.com>
|
||||||
|
Date: Fri, 7 May 2021 13:36:06 +0200
|
||||||
|
Subject: [PATCH 02/12] Do not write NM_CONTROLLED=no in generated interface config files
|
||||||
|
|
||||||
|
From 3a070f23440c9eb6e0e5fb3605e36285e8a5b727 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Date: Fri, 23 Jun 2023 16:54:24 +0530
|
||||||
|
Subject: [PATCH 27/51] test fixes: remove NM_CONTROLLED=no from tests
|
||||||
|
fixes: b3b96bff187e9 ("Do not write NM_CONTROLLED=no in generated interface config files")
|
||||||
|
|
||||||
|
X-downstream-only: true
|
||||||
|
|
||||||
|
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
---
|
||||||
|
cloudinit/net/sysconfig.py | 1 -
|
||||||
|
tests/unittests/cmd/devel/test_net_convert.py | 1 -
|
||||||
|
tests/unittests/distros/test_netconfig.py | 8 ---
|
||||||
|
tests/unittests/test_net.py | 53 -------------------
|
||||||
|
4 files changed, 63 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
||||||
|
index 7570a5e3..3b7a1f93 100644
|
||||||
|
--- a/cloudinit/net/sysconfig.py
|
||||||
|
+++ b/cloudinit/net/sysconfig.py
|
||||||
|
@@ -317,7 +317,6 @@ class Renderer(renderer.Renderer):
|
||||||
|
"rhel": {
|
||||||
|
"ONBOOT": True,
|
||||||
|
"USERCTL": False,
|
||||||
|
- "NM_CONTROLLED": False,
|
||||||
|
"BOOTPROTO": "none",
|
||||||
|
},
|
||||||
|
"suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
|
||||||
|
diff --git a/tests/unittests/cmd/devel/test_net_convert.py b/tests/unittests/cmd/devel/test_net_convert.py
|
||||||
|
index fb72963f..7b9121b2 100644
|
||||||
|
--- a/tests/unittests/cmd/devel/test_net_convert.py
|
||||||
|
+++ b/tests/unittests/cmd/devel/test_net_convert.py
|
||||||
|
@@ -62,7 +62,6 @@ SAMPLE_SYSCONFIG_CONTENT = """\
|
||||||
|
#
|
||||||
|
BOOTPROTO=dhcp
|
||||||
|
DEVICE=eth0
|
||||||
|
-NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
diff --git a/tests/unittests/distros/test_netconfig.py b/tests/unittests/distros/test_netconfig.py
|
||||||
|
index 7ba430f2..962ff7fb 100644
|
||||||
|
--- a/tests/unittests/distros/test_netconfig.py
|
||||||
|
+++ b/tests/unittests/distros/test_netconfig.py
|
||||||
|
@@ -723,7 +723,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
||||||
|
GATEWAY=192.168.1.254
|
||||||
|
IPADDR=192.168.1.5
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -733,7 +732,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
||||||
|
"""\
|
||||||
|
BOOTPROTO=dhcp
|
||||||
|
DEVICE=eth1
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -764,7 +762,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
||||||
|
IPV6_AUTOCONF=no
|
||||||
|
IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
|
||||||
|
IPV6_FORCE_ACCEPT_RA=no
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -774,7 +771,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
||||||
|
"""\
|
||||||
|
BOOTPROTO=dhcp
|
||||||
|
DEVICE=eth1
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -821,7 +817,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
||||||
|
HWADDR=00:16:3e:60:7c:df
|
||||||
|
IPADDR=192.10.1.2
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -833,7 +828,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
||||||
|
DEVICE=infra0
|
||||||
|
IPADDR=10.0.1.2
|
||||||
|
NETMASK=255.255.0.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
PHYSDEV=eth0
|
||||||
|
USERCTL=no
|
||||||
|
@@ -869,7 +863,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
||||||
|
DEVICE=eth0
|
||||||
|
IPADDR=192.10.1.2
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -881,7 +874,6 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
||||||
|
DEVICE=eth0.1001
|
||||||
|
IPADDR=10.0.1.2
|
||||||
|
NETMASK=255.255.0.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
PHYSDEV=eth0
|
||||||
|
USERCTL=no
|
||||||
|
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
||||||
|
index c5509536..052b0674 100644
|
||||||
|
--- a/tests/unittests/test_net.py
|
||||||
|
+++ b/tests/unittests/test_net.py
|
||||||
|
@@ -585,7 +585,6 @@ GATEWAY=172.19.3.254
|
||||||
|
HWADDR=fa:16:3e:ed:9a:59
|
||||||
|
IPADDR=172.19.1.34
|
||||||
|
NETMASK=255.255.252.0
|
||||||
|
-NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -750,7 +749,6 @@ IPADDR=172.19.1.34
|
||||||
|
IPADDR1=10.0.0.10
|
||||||
|
NETMASK=255.255.252.0
|
||||||
|
NETMASK1=255.255.255.0
|
||||||
|
-NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -912,7 +910,6 @@ IPV6_AUTOCONF=no
|
||||||
|
IPV6_DEFAULTGW=2001:DB8::1
|
||||||
|
IPV6_FORCE_ACCEPT_RA=no
|
||||||
|
NETMASK=255.255.252.0
|
||||||
|
-NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -1143,7 +1140,6 @@ NETWORK_CONFIGS = {
|
||||||
|
BOOTPROTO=none
|
||||||
|
DEVICE=eth1
|
||||||
|
HWADDR=cf:d6:af:48:e8:80
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no"""
|
||||||
|
@@ -1162,7 +1158,6 @@ NETWORK_CONFIGS = {
|
||||||
|
IPADDR=192.168.21.3
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
METRIC=10000
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no"""
|
||||||
|
@@ -1319,7 +1314,6 @@ NETWORK_CONFIGS = {
|
||||||
|
BOOTPROTO=none
|
||||||
|
DEVICE=eth1
|
||||||
|
HWADDR=cf:d6:af:48:e8:80
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no"""
|
||||||
|
@@ -1338,7 +1332,6 @@ NETWORK_CONFIGS = {
|
||||||
|
IPADDR=192.168.21.3
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
METRIC=10000
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no"""
|
||||||
|
@@ -1581,7 +1574,6 @@ NETWORK_CONFIGS = {
|
||||||
|
IPV6_AUTOCONF=no
|
||||||
|
IPV6_FORCE_ACCEPT_RA=no
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -1725,7 +1717,6 @@ NETWORK_CONFIGS = {
|
||||||
|
DHCPV6C=yes
|
||||||
|
IPV6INIT=yes
|
||||||
|
DEVICE=iface0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -1816,7 +1807,6 @@ NETWORK_CONFIGS = {
|
||||||
|
IPV6INIT=yes
|
||||||
|
IPV6_FORCE_ACCEPT_RA=yes
|
||||||
|
DEVICE=iface0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -1892,7 +1882,6 @@ NETWORK_CONFIGS = {
|
||||||
|
IPV6INIT=yes
|
||||||
|
IPV6_FORCE_ACCEPT_RA=no
|
||||||
|
DEVICE=iface0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -1956,7 +1945,6 @@ NETWORK_CONFIGS = {
|
||||||
|
IPV6_AUTOCONF=yes
|
||||||
|
IPV6INIT=yes
|
||||||
|
DEVICE=iface0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -2014,7 +2002,6 @@ NETWORK_CONFIGS = {
|
||||||
|
IPV6_AUTOCONF=no
|
||||||
|
IPV6_FORCE_ACCEPT_RA=no
|
||||||
|
DEVICE=iface0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -2071,7 +2058,6 @@ NETWORK_CONFIGS = {
|
||||||
|
IPV6_AUTOCONF=yes
|
||||||
|
IPV6INIT=yes
|
||||||
|
DEVICE=iface0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -2157,7 +2143,6 @@ NETWORK_CONFIGS = {
|
||||||
|
IPV6_FAILURE_FATAL=yes
|
||||||
|
IPV6_FORCE_ACCEPT_RA=yes
|
||||||
|
DEVICE=iface0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -2198,7 +2183,6 @@ NETWORK_CONFIGS = {
|
||||||
|
"""\
|
||||||
|
BOOTPROTO=dhcp
|
||||||
|
DEVICE=iface0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -2275,7 +2259,6 @@ NETWORK_CONFIGS = {
|
||||||
|
BOOTPROTO=dhcp
|
||||||
|
DEVICE=iface0
|
||||||
|
ETHTOOL_OPTS="wol g"
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -2619,7 +2602,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
||||||
|
DHCPV6C=yes
|
||||||
|
IPV6INIT=yes
|
||||||
|
MACADDR=aa:bb:cc:dd:ee:ff
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Bond
|
||||||
|
USERCTL=no"""
|
||||||
|
@@ -2629,7 +2611,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
||||||
|
BOOTPROTO=dhcp
|
||||||
|
DEVICE=bond0.200
|
||||||
|
DHCLIENT_SET_DEFAULT_ROUTE=no
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
PHYSDEV=bond0
|
||||||
|
USERCTL=no
|
||||||
|
@@ -2649,7 +2630,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
||||||
|
IPV6_DEFAULTGW=2001:4800:78ff:1b::1
|
||||||
|
MACADDR=bb:bb:bb:bb:bb:aa
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
PRIO=22
|
||||||
|
STP=no
|
||||||
|
@@ -2661,7 +2641,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
||||||
|
BOOTPROTO=none
|
||||||
|
DEVICE=eth0
|
||||||
|
HWADDR=c0:d6:9f:2c:e8:80
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no"""
|
||||||
|
@@ -2680,7 +2659,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
||||||
|
MTU=1500
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
NETMASK1=255.255.255.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
PHYSDEV=eth0
|
||||||
|
USERCTL=no
|
||||||
|
@@ -2692,7 +2670,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
||||||
|
DEVICE=eth1
|
||||||
|
HWADDR=aa:d6:9f:2c:e8:80
|
||||||
|
MASTER=bond0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
SLAVE=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
@@ -2704,7 +2681,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
||||||
|
DEVICE=eth2
|
||||||
|
HWADDR=c0:bb:9f:2c:e8:80
|
||||||
|
MASTER=bond0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
SLAVE=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
@@ -2716,7 +2692,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
||||||
|
BRIDGE=br0
|
||||||
|
DEVICE=eth3
|
||||||
|
HWADDR=66:bb:9f:2c:e8:80
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no"""
|
||||||
|
@@ -2727,7 +2702,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
||||||
|
BRIDGE=br0
|
||||||
|
DEVICE=eth4
|
||||||
|
HWADDR=98:bb:9f:2c:e8:80
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no"""
|
||||||
|
@@ -2738,7 +2712,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
||||||
|
DEVICE=eth5
|
||||||
|
DHCLIENT_SET_DEFAULT_ROUTE=no
|
||||||
|
HWADDR=98:bb:9f:2c:e8:8a
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=no
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no"""
|
||||||
|
@@ -2751,7 +2724,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
||||||
|
IPADDR=192.168.200.7
|
||||||
|
MTU=9000
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=InfiniBand
|
||||||
|
USERCTL=no"""
|
||||||
|
@@ -3473,7 +3445,6 @@ iface bond0 inet6 static
|
||||||
|
MTU=9000
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
NETMASK1=255.255.255.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Bond
|
||||||
|
USERCTL=no
|
||||||
|
@@ -3485,7 +3456,6 @@ iface bond0 inet6 static
|
||||||
|
DEVICE=bond0s0
|
||||||
|
HWADDR=aa:bb:cc:dd:e8:00
|
||||||
|
MASTER=bond0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
SLAVE=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
@@ -3513,7 +3483,6 @@ iface bond0 inet6 static
|
||||||
|
DEVICE=bond0s1
|
||||||
|
HWADDR=aa:bb:cc:dd:e8:01
|
||||||
|
MASTER=bond0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
SLAVE=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
@@ -3662,7 +3631,6 @@ iface bond0 inet6 static
|
||||||
|
BOOTPROTO=none
|
||||||
|
DEVICE=en0
|
||||||
|
HWADDR=aa:bb:cc:dd:e8:00
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no"""
|
||||||
|
@@ -3683,7 +3651,6 @@ iface bond0 inet6 static
|
||||||
|
MTU=2222
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
NETMASK1=255.255.255.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
PHYSDEV=en0
|
||||||
|
USERCTL=no
|
||||||
|
@@ -3811,7 +3778,6 @@ iface bond0 inet6 static
|
||||||
|
DEVICE=br0
|
||||||
|
IPADDR=192.168.2.2
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
PRIO=22
|
||||||
|
STP=no
|
||||||
|
@@ -3829,7 +3795,6 @@ iface bond0 inet6 static
|
||||||
|
IPV6INIT=yes
|
||||||
|
IPV6_AUTOCONF=no
|
||||||
|
IPV6_FORCE_ACCEPT_RA=no
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -3845,7 +3810,6 @@ iface bond0 inet6 static
|
||||||
|
IPV6INIT=yes
|
||||||
|
IPV6_AUTOCONF=no
|
||||||
|
IPV6_FORCE_ACCEPT_RA=no
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -4030,7 +3994,6 @@ iface bond0 inet6 static
|
||||||
|
HWADDR=52:54:00:12:34:00
|
||||||
|
IPADDR=192.168.1.2
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=no
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -4042,7 +4005,6 @@ iface bond0 inet6 static
|
||||||
|
DEVICE=eth1
|
||||||
|
HWADDR=52:54:00:12:34:aa
|
||||||
|
MTU=1480
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -4053,7 +4015,6 @@ iface bond0 inet6 static
|
||||||
|
BOOTPROTO=none
|
||||||
|
DEVICE=eth2
|
||||||
|
HWADDR=52:54:00:12:34:ff
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=no
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -4138,7 +4099,6 @@ iface bond0 inet6 static
|
||||||
|
BOOTPROTO=none
|
||||||
|
DEVICE=eth0
|
||||||
|
HWADDR=cf:d6:af:48:e8:80
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no"""
|
||||||
|
@@ -4736,7 +4696,6 @@ class TestRhelSysConfigRendering(CiTestCase):
|
||||||
|
BOOTPROTO=dhcp
|
||||||
|
DEVICE=eth1000
|
||||||
|
HWADDR=07-1c-c6-75-a4-be
|
||||||
|
-NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -4948,7 +4907,6 @@ GATEWAY=10.0.2.2
|
||||||
|
HWADDR=52:54:00:12:34:00
|
||||||
|
IPADDR=10.0.2.15
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
-NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -4979,7 +4937,6 @@ HWADDR=fa:16:3e:25:b4:59
|
||||||
|
IPADDR=51.68.89.122
|
||||||
|
MTU=1500
|
||||||
|
NETMASK=255.255.240.0
|
||||||
|
-NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -4993,7 +4950,6 @@ DEVICE=eth1
|
||||||
|
DHCLIENT_SET_DEFAULT_ROUTE=no
|
||||||
|
HWADDR=fa:16:3e:b1:ca:29
|
||||||
|
MTU=9000
|
||||||
|
-NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -5018,7 +4974,6 @@ USERCTL=no
|
||||||
|
#
|
||||||
|
BOOTPROTO=dhcp
|
||||||
|
DEVICE=eth0
|
||||||
|
-NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -5251,7 +5206,6 @@ USERCTL=no
|
||||||
|
IPV6_FORCE_ACCEPT_RA=no
|
||||||
|
IPV6_DEFAULTGW=2001:db8::1
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -5283,7 +5237,6 @@ USERCTL=no
|
||||||
|
"""\
|
||||||
|
BOOTPROTO=none
|
||||||
|
DEVICE=eno1
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -5296,7 +5249,6 @@ USERCTL=no
|
||||||
|
IPADDR=192.6.1.9
|
||||||
|
MTU=1495
|
||||||
|
NETMASK=255.255.255.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
PHYSDEV=eno1
|
||||||
|
USERCTL=no
|
||||||
|
@@ -5332,7 +5284,6 @@ USERCTL=no
|
||||||
|
IPADDR=10.101.8.65
|
||||||
|
MTU=1334
|
||||||
|
NETMASK=255.255.255.192
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Bond
|
||||||
|
USERCTL=no
|
||||||
|
@@ -5344,7 +5295,6 @@ USERCTL=no
|
||||||
|
BOOTPROTO=none
|
||||||
|
DEVICE=enp0s0
|
||||||
|
MASTER=bond0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
SLAVE=yes
|
||||||
|
TYPE=Bond
|
||||||
|
@@ -5357,7 +5307,6 @@ USERCTL=no
|
||||||
|
BOOTPROTO=none
|
||||||
|
DEVICE=enp0s1
|
||||||
|
MASTER=bond0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
SLAVE=yes
|
||||||
|
TYPE=Bond
|
||||||
|
@@ -5388,7 +5337,6 @@ USERCTL=no
|
||||||
|
DEVICE=eno1
|
||||||
|
HWADDR=07-1c-c6-75-a4-be
|
||||||
|
METRIC=100
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -5479,7 +5427,6 @@ USERCTL=no
|
||||||
|
IPV6_FORCE_ACCEPT_RA=no
|
||||||
|
MTU=1400
|
||||||
|
NETMASK=255.255.248.0
|
||||||
|
- NM_CONTROLLED=no
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -1,69 +0,0 @@
|
||||||
From 6134624f10ef56534e37624adc12f11b09910591 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Date: Fri, 7 May 2021 13:36:08 +0200
|
|
||||||
Subject: limit permissions on def_log_file
|
|
||||||
|
|
||||||
This sets a default mode of 0600 on def_log_file, and makes this
|
|
||||||
configurable via the def_log_file_mode option in cloud.cfg.
|
|
||||||
|
|
||||||
LP: #1541196
|
|
||||||
Resolves: rhbz#1424612
|
|
||||||
X-approved-upstream: true
|
|
||||||
|
|
||||||
Conflicts 21.1:
|
|
||||||
cloudinit/stages.py: adjusting call of ensure_file() to use more
|
|
||||||
recent version
|
|
||||||
|
|
||||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
---
|
|
||||||
cloudinit/settings.py | 1 +
|
|
||||||
cloudinit/stages.py | 1 +
|
|
||||||
doc/examples/cloud-config.txt | 4 ++++
|
|
||||||
3 files changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
|
|
||||||
index e690c0fd..43a1490c 100644
|
|
||||||
--- a/cloudinit/settings.py
|
|
||||||
+++ b/cloudinit/settings.py
|
|
||||||
@@ -46,6 +46,7 @@ CFG_BUILTIN = {
|
|
||||||
'None',
|
|
||||||
],
|
|
||||||
'def_log_file': '/var/log/cloud-init.log',
|
|
||||||
+ 'def_log_file_mode': 0o600,
|
|
||||||
'log_cfgs': [],
|
|
||||||
'mount_default_fields': [None, None, 'auto', 'defaults,nofail', '0', '2'],
|
|
||||||
'ssh_deletekeys': False,
|
|
||||||
diff --git a/cloudinit/stages.py b/cloudinit/stages.py
|
|
||||||
index 3ef4491c..83e25dd1 100644
|
|
||||||
--- a/cloudinit/stages.py
|
|
||||||
+++ b/cloudinit/stages.py
|
|
||||||
@@ -147,6 +147,7 @@ class Init(object):
|
|
||||||
def _initialize_filesystem(self):
|
|
||||||
util.ensure_dirs(self._initial_subdirs())
|
|
||||||
log_file = util.get_cfg_option_str(self.cfg, 'def_log_file')
|
|
||||||
+ log_file_mode = util.get_cfg_option_int(self.cfg, 'def_log_file_mode')
|
|
||||||
if log_file:
|
|
||||||
util.ensure_file(log_file, preserve_mode=True)
|
|
||||||
perms = self.cfg.get('syslog_fix_perms')
|
|
||||||
diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt
|
|
||||||
index de9a0f87..bb33ad45 100644
|
|
||||||
--- a/doc/examples/cloud-config.txt
|
|
||||||
+++ b/doc/examples/cloud-config.txt
|
|
||||||
@@ -414,10 +414,14 @@ timezone: US/Eastern
|
|
||||||
# if syslog_fix_perms is a list, it will iterate through and use the
|
|
||||||
# first pair that does not raise error.
|
|
||||||
#
|
|
||||||
+# 'def_log_file' will be created with mode 'def_log_file_mode', which
|
|
||||||
+# is specified as a numeric value and defaults to 0600.
|
|
||||||
+#
|
|
||||||
# the default values are '/var/log/cloud-init.log' and 'syslog:adm'
|
|
||||||
# the value of 'def_log_file' should match what is configured in logging
|
|
||||||
# if either is empty, then no change of ownership will be done
|
|
||||||
def_log_file: /var/log/my-logging-file.log
|
|
||||||
+def_log_file_mode: 0600
|
|
||||||
syslog_fix_perms: syslog:root
|
|
||||||
|
|
||||||
# you can set passwords for a user or multiple users
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From dfea0490b899804761fbd7aa23822783d7c36ec5 Mon Sep 17 00:00:00 2001
|
From fea3e7fc6d23e988cf4a33dc03064ff31bf1d72d Mon Sep 17 00:00:00 2001
|
||||||
From: Eduardo Otubo <otubo@redhat.com>
|
From: Eduardo Otubo <otubo@redhat.com>
|
||||||
Date: Fri, 7 May 2021 13:36:13 +0200
|
Date: Fri, 7 May 2021 13:36:13 +0200
|
||||||
Subject: include 'NOZEROCONF=yes' in /etc/sysconfig/network
|
Subject: include 'NOZEROCONF=yes' in /etc/sysconfig/network
|
||||||
|
@ -21,45 +21,33 @@ Resolves: rhbz#1653131
|
||||||
|
|
||||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||||
|
(cherry picked from commit ffa647e83efd4293bd027e9e390274aad8a12d94)
|
||||||
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
||||||
---
|
---
|
||||||
cloudinit/net/sysconfig.py | 11 ++++++++++-
|
cloudinit/net/sysconfig.py | 11 ++++++++++-
|
||||||
tests/unittests/test_net.py | 1 -
|
redhat/scripts/frh.py | 10 +++++++---
|
||||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
2 files changed, 17 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
||||||
index 3d276666..d5440998 100644
|
index 3b7a1f93..f01c4236 100644
|
||||||
--- a/cloudinit/net/sysconfig.py
|
--- a/cloudinit/net/sysconfig.py
|
||||||
+++ b/cloudinit/net/sysconfig.py
|
+++ b/cloudinit/net/sysconfig.py
|
||||||
@@ -925,7 +925,16 @@ class Renderer(renderer.Renderer):
|
@@ -1029,7 +1029,16 @@ class Renderer(renderer.Renderer):
|
||||||
# Distros configuring /etc/sysconfig/network as a file e.g. Centos
|
# Distros configuring /etc/sysconfig/network as a file e.g. Centos
|
||||||
if sysconfig_path.endswith('network'):
|
if sysconfig_path.endswith("network"):
|
||||||
util.ensure_dir(os.path.dirname(sysconfig_path))
|
util.ensure_dir(os.path.dirname(sysconfig_path))
|
||||||
- netcfg = [_make_header(), 'NETWORKING=yes']
|
- netcfg = [_make_header(), "NETWORKING=yes"]
|
||||||
+ netcfg = []
|
+ netcfg = []
|
||||||
+ for line in util.load_file(sysconfig_path, quiet=True).split('\n'):
|
+ for line in util.load_file(sysconfig_path, quiet=True).split("\n"):
|
||||||
+ if 'cloud-init' in line:
|
+ if "cloud-init" in line:
|
||||||
+ break
|
+ break
|
||||||
+ if not line.startswith(('NETWORKING=',
|
+ if not line.startswith(
|
||||||
+ 'IPV6_AUTOCONF=',
|
+ ("NETWORKING=", "IPV6_AUTOCONF=", "NETWORKING_IPV6=")
|
||||||
+ 'NETWORKING_IPV6=')):
|
+ ):
|
||||||
+ netcfg.append(line)
|
+ netcfg.append(line)
|
||||||
+ # Now generate the cloud-init portion of sysconfig/network
|
+ # Now generate the cloud-init portion of sysconfig/network
|
||||||
+ netcfg.extend([_make_header(), 'NETWORKING=yes'])
|
+ netcfg.extend([_make_header(), "NETWORKING=yes"])
|
||||||
if network_state.use_ipv6:
|
if network_state.use_ipv6:
|
||||||
netcfg.append('NETWORKING_IPV6=yes')
|
netcfg.append("NETWORKING_IPV6=yes")
|
||||||
netcfg.append('IPV6_AUTOCONF=no')
|
netcfg.append("IPV6_AUTOCONF=no")
|
||||||
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
|
||||||
index 4ea0e597..c67b5fcc 100644
|
|
||||||
--- a/tests/unittests/test_net.py
|
|
||||||
+++ b/tests/unittests/test_net.py
|
|
||||||
@@ -1729,7 +1729,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=bond0
|
|
||||||
DHCPV6C=yes
|
|
||||||
- IPV6_AUTOCONF=no
|
|
||||||
IPV6INIT=yes
|
|
||||||
MACADDR=aa:bb:cc:dd:ee:ff
|
|
||||||
ONBOOT=yes
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
From 699d37a6ff3e343e214943794aac09e4156c2b2b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Date: Fri, 7 May 2021 13:36:10 +0200
|
|
||||||
Subject: sysconfig: Don't write BOOTPROTO=dhcp for ipv6 dhcp
|
|
||||||
|
|
||||||
Don't write BOOTPROTO=dhcp for ipv6 dhcp, as BOOTPROTO applies
|
|
||||||
only to ipv4. Explicitly write IPV6_AUTOCONF=no for dhcp on ipv6.
|
|
||||||
|
|
||||||
X-downstream-only: yes
|
|
||||||
|
|
||||||
Resolves: rhbz#1519271
|
|
||||||
Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
|
|
||||||
|
|
||||||
Merged patches (19.4):
|
|
||||||
- 6444df4 sysconfig: Don't disable IPV6_AUTOCONF
|
|
||||||
|
|
||||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
---
|
|
||||||
tests/unittests/test_net.py | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
|
||||||
index c67b5fcc..4ea0e597 100644
|
|
||||||
--- a/tests/unittests/test_net.py
|
|
||||||
+++ b/tests/unittests/test_net.py
|
|
||||||
@@ -1729,6 +1729,7 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
||||||
BOOTPROTO=none
|
|
||||||
DEVICE=bond0
|
|
||||||
DHCPV6C=yes
|
|
||||||
+ IPV6_AUTOCONF=no
|
|
||||||
IPV6INIT=yes
|
|
||||||
MACADDR=aa:bb:cc:dd:ee:ff
|
|
||||||
ONBOOT=yes
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
|
@ -1,57 +0,0 @@
|
||||||
From ccc75c1be3ae08d813193071c798fc905b5c03e5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Date: Fri, 7 May 2021 13:36:12 +0200
|
|
||||||
Subject: DataSourceAzure.py: use hostnamectl to set hostname
|
|
||||||
|
|
||||||
RH-Author: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
||||||
Message-id: <20180417130754.12918-3-vkuznets@redhat.com>
|
|
||||||
Patchwork-id: 79659
|
|
||||||
O-Subject: [RHEL7.6/7.5.z cloud-init PATCH 2/2] DataSourceAzure.py: use hostnamectl to set hostname
|
|
||||||
Bugzilla: 1568717
|
|
||||||
RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
|
||||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
||||||
|
|
||||||
The right way to set hostname in RHEL7 is:
|
|
||||||
|
|
||||||
$ hostnamectl set-hostname HOSTNAME
|
|
||||||
|
|
||||||
DataSourceAzure, however, uses:
|
|
||||||
$ hostname HOSTSNAME
|
|
||||||
|
|
||||||
instead and this causes problems. We can't simply change
|
|
||||||
'BUILTIN_DS_CONFIG' in DataSourceAzure.py as 'hostname' is being used
|
|
||||||
for both getting and setting the hostname.
|
|
||||||
|
|
||||||
Long term, this should be fixed in a different way. Cloud-init
|
|
||||||
has distro-specific hostname setting/getting (see
|
|
||||||
cloudinit/distros/rhel.py) and DataSourceAzure.py needs to be switched
|
|
||||||
to use these.
|
|
||||||
|
|
||||||
Resolves: rhbz#1434109
|
|
||||||
|
|
||||||
X-downstream-only: yes
|
|
||||||
|
|
||||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
||||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
||||||
---
|
|
||||||
cloudinit/sources/DataSourceAzure.py | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
|
|
||||||
index cee630f7..553b5a7e 100755
|
|
||||||
--- a/cloudinit/sources/DataSourceAzure.py
|
|
||||||
+++ b/cloudinit/sources/DataSourceAzure.py
|
|
||||||
@@ -296,7 +296,7 @@ def get_hostname(hostname_command='hostname'):
|
|
||||||
|
|
||||||
|
|
||||||
def set_hostname(hostname, hostname_command='hostname'):
|
|
||||||
- subp.subp([hostname_command, hostname])
|
|
||||||
+ util.subp(['hostnamectl', 'set-hostname', str(hostname)])
|
|
||||||
|
|
||||||
|
|
||||||
@azure_ds_telemetry_reporter
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
|
@ -0,0 +1,83 @@
|
||||||
|
From f7236c817aee8c39223cca88deb8341b4f2b5dfa Mon Sep 17 00:00:00 2001
|
||||||
|
From: Cathy Avery <cavery@redhat.com>
|
||||||
|
Date: Mon, 18 Dec 2023 14:13:19 -0500
|
||||||
|
Subject: settings.py: update settings for rhel
|
||||||
|
|
||||||
|
commit 2bf34313f2e9599e3304b5446411b5ada6ccd7f0
|
||||||
|
Author: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Date: Tue Apr 11 04:20:00 2023 -0400
|
||||||
|
Please see commit 5e1e568d7085fd4443
|
||||||
|
|
||||||
|
(" Add initial redhat setup")
|
||||||
|
from rhel8.8.0 branch for setings.py. Applying the same for the rebased
|
||||||
|
cloud-init.
|
||||||
|
|
||||||
|
X-downstream-only: true
|
||||||
|
|
||||||
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
|
||||||
|
Conflicts: "def_log_file_mode": 0o600 as commit
|
||||||
|
130899115 'limit permissions on def_log_file' was not applied.
|
||||||
|
|
||||||
|
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
---
|
||||||
|
cloudinit/settings.py | 7 +++++--
|
||||||
|
tests/unittests/cmd/test_main.py | 17 +++++++++++------
|
||||||
|
2 files changed, 16 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
|
||||||
|
index 592e144d..87829ff0 100644
|
||||||
|
--- a/cloudinit/settings.py
|
||||||
|
+++ b/cloudinit/settings.py
|
||||||
|
@@ -54,13 +54,16 @@ CFG_BUILTIN = {
|
||||||
|
],
|
||||||
|
"def_log_file": "/var/log/cloud-init.log",
|
||||||
|
"log_cfgs": [],
|
||||||
|
- "syslog_fix_perms": ["syslog:adm", "root:adm", "root:wheel", "root:root"],
|
||||||
|
+ "syslog_fix_perms": [],
|
||||||
|
+ "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
|
||||||
|
+ "ssh_deletekeys": False,
|
||||||
|
+ "ssh_genkeytypes": [],
|
||||||
|
"system_info": {
|
||||||
|
"paths": {
|
||||||
|
"cloud_dir": "/var/lib/cloud",
|
||||||
|
"templates_dir": "/etc/cloud/templates/",
|
||||||
|
},
|
||||||
|
- "distro": "ubuntu",
|
||||||
|
+ "distro": "rhel",
|
||||||
|
"network": {"renderers": None},
|
||||||
|
},
|
||||||
|
"vendor_data": {"enabled": True, "prefix": []},
|
||||||
|
diff --git a/tests/unittests/cmd/test_main.py b/tests/unittests/cmd/test_main.py
|
||||||
|
index ab427115..c8c2ae81 100644
|
||||||
|
--- a/tests/unittests/cmd/test_main.py
|
||||||
|
+++ b/tests/unittests/cmd/test_main.py
|
||||||
|
@@ -119,14 +119,19 @@ class TestMain(FilesystemMockingTestCase):
|
||||||
|
{
|
||||||
|
"def_log_file": "/var/log/cloud-init.log",
|
||||||
|
"log_cfgs": [],
|
||||||
|
- "syslog_fix_perms": [
|
||||||
|
- "syslog:adm",
|
||||||
|
- "root:adm",
|
||||||
|
- "root:wheel",
|
||||||
|
- "root:root",
|
||||||
|
- ],
|
||||||
|
"vendor_data": {"enabled": True, "prefix": []},
|
||||||
|
"vendor_data2": {"enabled": True, "prefix": []},
|
||||||
|
+ "syslog_fix_perms": [],
|
||||||
|
+ "ssh_deletekeys": False,
|
||||||
|
+ "ssh_genkeytypes": [],
|
||||||
|
+ "mount_default_fields": [
|
||||||
|
+ None,
|
||||||
|
+ None,
|
||||||
|
+ "auto",
|
||||||
|
+ "defaults,nofail",
|
||||||
|
+ "0",
|
||||||
|
+ "2",
|
||||||
|
+ ],
|
||||||
|
}
|
||||||
|
)
|
||||||
|
updated_cfg.pop("system_info")
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -1,148 +0,0 @@
|
||||||
From 24894dcf45a307f44e29dc5d5b2d864b75fd982c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Date: Fri, 7 May 2021 13:36:14 +0200
|
|
||||||
Subject: Remove race condition between cloud-init and NetworkManager
|
|
||||||
|
|
||||||
Message-id: <20200302104635.11648-1-otubo@redhat.com>
|
|
||||||
Patchwork-id: 94098
|
|
||||||
O-Subject: [RHEL-7.9/RHEL-8.2.0 cloud-init PATCH] Remove race condition between cloud-init and NetworkManager
|
|
||||||
Bugzilla: 1807797
|
|
||||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
||||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
|
||||||
|
|
||||||
BZ: 1748015
|
|
||||||
BRANCH: rhel7/master-18.5
|
|
||||||
BREW: 26924611
|
|
||||||
|
|
||||||
BZ: 1807797
|
|
||||||
BRANCH: rhel820/master-18.5
|
|
||||||
BREW: 26924957
|
|
||||||
|
|
||||||
cloud-init service is set to start before NetworkManager service starts,
|
|
||||||
but this does not avoid a race condition between them. NetworkManager
|
|
||||||
starts before cloud-init can write `dns=none' to the file:
|
|
||||||
/etc/NetworkManager/conf.d/99-cloud-init.conf. This way NetworkManager
|
|
||||||
doesn't read the configuration and erases all resolv.conf values upon
|
|
||||||
shutdown. On the next reboot neither cloud-init or NetworkManager will
|
|
||||||
write anything to resolv.conf, leaving it blank.
|
|
||||||
|
|
||||||
This patch introduces a NM reload (try-restart) at the end of cloud-init
|
|
||||||
start up so it won't erase resolv.conf upon first shutdown.
|
|
||||||
|
|
||||||
x-downstream-only: yes
|
|
||||||
resolves: rhbz#1748015, rhbz#1807797 and rhbz#1804780
|
|
||||||
|
|
||||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
||||||
|
|
||||||
This commit is a squash and also includes the folloowing commits:
|
|
||||||
|
|
||||||
commit 316a17b7c02a87fa9b2981535be0b20d165adc46
|
|
||||||
Author: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Date: Mon Jun 1 11:58:06 2020 +0200
|
|
||||||
|
|
||||||
Make cloud-init.service execute after network is up
|
|
||||||
|
|
||||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Message-id: <20200526090804.2047-1-otubo@redhat.com>
|
|
||||||
Patchwork-id: 96809
|
|
||||||
O-Subject: [RHEL-8.2.1 cloud-init PATCH] Make cloud-init.service execute after network is up
|
|
||||||
Bugzilla: 1803928
|
|
||||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
||||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
||||||
|
|
||||||
cloud-init.service needs to wait until network is fully up before
|
|
||||||
continuing executing and configuring its service.
|
|
||||||
|
|
||||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
|
|
||||||
x-downstream-only: yes
|
|
||||||
Resolves: rhbz#1831646
|
|
||||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
||||||
|
|
||||||
commit 0422ba0e773d1a8257a3f2bf3db05f3bc7917eb7
|
|
||||||
Author: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Date: Thu May 28 08:44:08 2020 +0200
|
|
||||||
|
|
||||||
Remove race condition between cloud-init and NetworkManager
|
|
||||||
|
|
||||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Message-id: <20200327121911.17699-1-otubo@redhat.com>
|
|
||||||
Patchwork-id: 94453
|
|
||||||
O-Subject: [RHEL-7.9/RHEL-8.2.0 cloud-init PATCHv2] Remove race condition between cloud-init and NetworkManager
|
|
||||||
Bugzilla: 1840648
|
|
||||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
||||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
||||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
||||||
|
|
||||||
cloud-init service is set to start before NetworkManager service starts,
|
|
||||||
but this does not avoid a race condition between them. NetworkManager
|
|
||||||
starts before cloud-init can write `dns=none' to the file:
|
|
||||||
/etc/NetworkManager/conf.d/99-cloud-init.conf. This way NetworkManager
|
|
||||||
doesn't read the configuration and erases all resolv.conf values upon
|
|
||||||
shutdown. On the next reboot neither cloud-init or NetworkManager will
|
|
||||||
write anything to resolv.conf, leaving it blank.
|
|
||||||
|
|
||||||
This patch introduces a NM reload (try-reload-or-restart) at the end of cloud-init
|
|
||||||
start up so it won't erase resolv.conf upon first shutdown.
|
|
||||||
|
|
||||||
x-downstream-only: yes
|
|
||||||
|
|
||||||
Signed-off-by: Eduardo Otubo otubo@redhat.com
|
|
||||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
||||||
|
|
||||||
commit e0b48a936433faea7f56dbc29dda35acf7d375f7
|
|
||||||
Author: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Date: Thu May 28 08:44:06 2020 +0200
|
|
||||||
|
|
||||||
Enable ssh_deletekeys by default
|
|
||||||
|
|
||||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Message-id: <20200317091705.15715-1-otubo@redhat.com>
|
|
||||||
Patchwork-id: 94365
|
|
||||||
O-Subject: [RHEL-7.9/RHEL-8.2.0 cloud-init PATCH] Enable ssh_deletekeys by default
|
|
||||||
Bugzilla: 1814152
|
|
||||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
|
||||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
||||||
|
|
||||||
The configuration option ssh_deletekeys will trigger the generation
|
|
||||||
of new ssh keys for every new instance deployed.
|
|
||||||
|
|
||||||
x-downstream-only: yes
|
|
||||||
resolves: rhbz#1814152
|
|
||||||
|
|
||||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
||||||
---
|
|
||||||
rhel/cloud.cfg | 2 +-
|
|
||||||
rhel/systemd/cloud-init.service | 1 +
|
|
||||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg
|
|
||||||
index 82e8bf62..9ecba215 100644
|
|
||||||
--- a/rhel/cloud.cfg
|
|
||||||
+++ b/rhel/cloud.cfg
|
|
||||||
@@ -6,7 +6,7 @@ ssh_pwauth: 0
|
|
||||||
|
|
||||||
mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service', '0', '2']
|
|
||||||
resize_rootfs_tmp: /dev
|
|
||||||
-ssh_deletekeys: 0
|
|
||||||
+ssh_deletekeys: 1
|
|
||||||
ssh_genkeytypes: ~
|
|
||||||
syslog_fix_perms: ~
|
|
||||||
disable_vmware_customization: false
|
|
||||||
diff --git a/rhel/systemd/cloud-init.service b/rhel/systemd/cloud-init.service
|
|
||||||
index d0023a05..0b3d796d 100644
|
|
||||||
--- a/rhel/systemd/cloud-init.service
|
|
||||||
+++ b/rhel/systemd/cloud-init.service
|
|
||||||
@@ -5,6 +5,7 @@ Wants=sshd-keygen.service
|
|
||||||
Wants=sshd.service
|
|
||||||
After=cloud-init-local.service
|
|
||||||
After=NetworkManager.service network.service
|
|
||||||
+After=NetworkManager-wait-online.service
|
|
||||||
Before=network-online.target
|
|
||||||
Before=sshd-keygen.service
|
|
||||||
Before=sshd.service
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
|
@ -1,496 +0,0 @@
|
||||||
From b48dda73da94782d7ab0c455fa382d3a5ef3c419 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Watkins <oddbloke@ubuntu.com>
|
|
||||||
Date: Mon, 8 Mar 2021 12:50:57 -0500
|
|
||||||
Subject: net: exclude OVS internal interfaces in get_interfaces (#829)
|
|
||||||
|
|
||||||
`get_interfaces` is used to in two ways, broadly: firstly, to determine
|
|
||||||
the available interfaces when converting cloud network configuration
|
|
||||||
formats to cloud-init's network configuration formats; and, secondly, to
|
|
||||||
ensure that any interfaces which are specified in network configuration
|
|
||||||
are (a) available, and (b) named correctly. The first of these is
|
|
||||||
unaffected by this commit, as no clouds support Open vSwitch
|
|
||||||
configuration in their network configuration formats.
|
|
||||||
|
|
||||||
For the second, we check that MAC addresses of physical devices are
|
|
||||||
unique. In some OVS configurations, there are OVS-created devices which
|
|
||||||
have duplicate MAC addresses, either with each other or with physical
|
|
||||||
devices. As these interfaces are created by OVS, we can be confident
|
|
||||||
that (a) they will be available when appropriate, and (b) that OVS will
|
|
||||||
name them correctly. As such, this commit excludes any OVS-internal
|
|
||||||
interfaces from the set of interfaces returned by `get_interfaces`.
|
|
||||||
|
|
||||||
LP: #1912844
|
|
||||||
---
|
|
||||||
cloudinit/net/__init__.py | 62 +++++++++
|
|
||||||
cloudinit/net/tests/test_init.py | 119 ++++++++++++++++++
|
|
||||||
.../sources/helpers/tests/test_openstack.py | 5 +
|
|
||||||
cloudinit/sources/tests/test_oracle.py | 4 +
|
|
||||||
.../integration_tests/bugs/test_lp1912844.py | 103 +++++++++++++++
|
|
||||||
.../test_datasource/test_configdrive.py | 8 ++
|
|
||||||
tests/unittests/test_net.py | 20 +++
|
|
||||||
7 files changed, 321 insertions(+)
|
|
||||||
create mode 100644 tests/integration_tests/bugs/test_lp1912844.py
|
|
||||||
|
|
||||||
diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
|
|
||||||
index de65e7af..385b7bcc 100644
|
|
||||||
--- a/cloudinit/net/__init__.py
|
|
||||||
+++ b/cloudinit/net/__init__.py
|
|
||||||
@@ -6,6 +6,7 @@
|
|
||||||
# This file is part of cloud-init. See LICENSE file for license information.
|
|
||||||
|
|
||||||
import errno
|
|
||||||
+import functools
|
|
||||||
import ipaddress
|
|
||||||
import logging
|
|
||||||
import os
|
|
||||||
@@ -19,6 +20,19 @@ from cloudinit.url_helper import UrlError, readurl
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
SYS_CLASS_NET = "/sys/class/net/"
|
|
||||||
DEFAULT_PRIMARY_INTERFACE = 'eth0'
|
|
||||||
+OVS_INTERNAL_INTERFACE_LOOKUP_CMD = [
|
|
||||||
+ "ovs-vsctl",
|
|
||||||
+ "--format",
|
|
||||||
+ "csv",
|
|
||||||
+ "--no-headings",
|
|
||||||
+ "--timeout",
|
|
||||||
+ "10",
|
|
||||||
+ "--columns",
|
|
||||||
+ "name",
|
|
||||||
+ "find",
|
|
||||||
+ "interface",
|
|
||||||
+ "type=internal",
|
|
||||||
+]
|
|
||||||
|
|
||||||
|
|
||||||
def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
|
|
||||||
@@ -133,6 +147,52 @@ def master_is_openvswitch(devname):
|
|
||||||
return os.path.exists(ovs_path)
|
|
||||||
|
|
||||||
|
|
||||||
+@functools.lru_cache(maxsize=None)
|
|
||||||
+def openvswitch_is_installed() -> bool:
|
|
||||||
+ """Return a bool indicating if Open vSwitch is installed in the system."""
|
|
||||||
+ ret = bool(subp.which("ovs-vsctl"))
|
|
||||||
+ if not ret:
|
|
||||||
+ LOG.debug(
|
|
||||||
+ "ovs-vsctl not in PATH; not detecting Open vSwitch interfaces"
|
|
||||||
+ )
|
|
||||||
+ return ret
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+@functools.lru_cache(maxsize=None)
|
|
||||||
+def get_ovs_internal_interfaces() -> list:
|
|
||||||
+ """Return a list of the names of OVS internal interfaces on the system.
|
|
||||||
+
|
|
||||||
+ These will all be strings, and are used to exclude OVS-specific interface
|
|
||||||
+ from cloud-init's network configuration handling.
|
|
||||||
+ """
|
|
||||||
+ try:
|
|
||||||
+ out, _err = subp.subp(OVS_INTERNAL_INTERFACE_LOOKUP_CMD)
|
|
||||||
+ except subp.ProcessExecutionError as exc:
|
|
||||||
+ if "database connection failed" in exc.stderr:
|
|
||||||
+ LOG.info(
|
|
||||||
+ "Open vSwitch is not yet up; no interfaces will be detected as"
|
|
||||||
+ " OVS-internal"
|
|
||||||
+ )
|
|
||||||
+ return []
|
|
||||||
+ raise
|
|
||||||
+ else:
|
|
||||||
+ return out.splitlines()
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+def is_openvswitch_internal_interface(devname: str) -> bool:
|
|
||||||
+ """Returns True if this is an OVS internal interface.
|
|
||||||
+
|
|
||||||
+ If OVS is not installed or not yet running, this will return False.
|
|
||||||
+ """
|
|
||||||
+ if not openvswitch_is_installed():
|
|
||||||
+ return False
|
|
||||||
+ ovs_bridges = get_ovs_internal_interfaces()
|
|
||||||
+ if devname in ovs_bridges:
|
|
||||||
+ LOG.debug("Detected %s as an OVS interface", devname)
|
|
||||||
+ return True
|
|
||||||
+ return False
|
|
||||||
+
|
|
||||||
+
|
|
||||||
def is_netfailover(devname, driver=None):
|
|
||||||
""" netfailover driver uses 3 nics, master, primary and standby.
|
|
||||||
this returns True if the device is either the primary or standby
|
|
||||||
@@ -884,6 +944,8 @@ def get_interfaces(blacklist_drivers=None) -> list:
|
|
||||||
# skip nics that have no mac (00:00....)
|
|
||||||
if name != 'lo' and mac == zero_mac[:len(mac)]:
|
|
||||||
continue
|
|
||||||
+ if is_openvswitch_internal_interface(name):
|
|
||||||
+ continue
|
|
||||||
# skip nics that have drivers blacklisted
|
|
||||||
driver = device_driver(name)
|
|
||||||
if driver in blacklist_drivers:
|
|
||||||
diff --git a/cloudinit/net/tests/test_init.py b/cloudinit/net/tests/test_init.py
|
|
||||||
index 0535387a..946f8ee2 100644
|
|
||||||
--- a/cloudinit/net/tests/test_init.py
|
|
||||||
+++ b/cloudinit/net/tests/test_init.py
|
|
||||||
@@ -391,6 +391,10 @@ class TestGetDeviceList(CiTestCase):
|
|
||||||
self.assertCountEqual(['eth0', 'eth1'], net.get_devicelist())
|
|
||||||
|
|
||||||
|
|
||||||
+@mock.patch(
|
|
||||||
+ "cloudinit.net.is_openvswitch_internal_interface",
|
|
||||||
+ mock.Mock(return_value=False),
|
|
||||||
+)
|
|
||||||
class TestGetInterfaceMAC(CiTestCase):
|
|
||||||
|
|
||||||
def setUp(self):
|
|
||||||
@@ -1224,6 +1228,121 @@ class TestNetFailOver(CiTestCase):
|
|
||||||
self.assertFalse(net.is_netfailover(devname, driver))
|
|
||||||
|
|
||||||
|
|
||||||
+class TestOpenvswitchIsInstalled:
|
|
||||||
+ """Test cloudinit.net.openvswitch_is_installed.
|
|
||||||
+
|
|
||||||
+ Uses the ``clear_lru_cache`` local autouse fixture to allow us to test
|
|
||||||
+ despite the ``lru_cache`` decorator on the unit under test.
|
|
||||||
+ """
|
|
||||||
+
|
|
||||||
+ @pytest.fixture(autouse=True)
|
|
||||||
+ def clear_lru_cache(self):
|
|
||||||
+ net.openvswitch_is_installed.cache_clear()
|
|
||||||
+
|
|
||||||
+ @pytest.mark.parametrize(
|
|
||||||
+ "expected,which_return", [(True, "/some/path"), (False, None)]
|
|
||||||
+ )
|
|
||||||
+ @mock.patch("cloudinit.net.subp.which")
|
|
||||||
+ def test_mirrors_which_result(self, m_which, expected, which_return):
|
|
||||||
+ m_which.return_value = which_return
|
|
||||||
+ assert expected == net.openvswitch_is_installed()
|
|
||||||
+
|
|
||||||
+ @mock.patch("cloudinit.net.subp.which")
|
|
||||||
+ def test_only_calls_which_once(self, m_which):
|
|
||||||
+ net.openvswitch_is_installed()
|
|
||||||
+ net.openvswitch_is_installed()
|
|
||||||
+ assert 1 == m_which.call_count
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+@mock.patch("cloudinit.net.subp.subp", return_value=("", ""))
|
|
||||||
+class TestGetOVSInternalInterfaces:
|
|
||||||
+ """Test cloudinit.net.get_ovs_internal_interfaces.
|
|
||||||
+
|
|
||||||
+ Uses the ``clear_lru_cache`` local autouse fixture to allow us to test
|
|
||||||
+ despite the ``lru_cache`` decorator on the unit under test.
|
|
||||||
+ """
|
|
||||||
+ @pytest.fixture(autouse=True)
|
|
||||||
+ def clear_lru_cache(self):
|
|
||||||
+ net.get_ovs_internal_interfaces.cache_clear()
|
|
||||||
+
|
|
||||||
+ def test_command_used(self, m_subp):
|
|
||||||
+ """Test we use the correct command when we call subp"""
|
|
||||||
+ net.get_ovs_internal_interfaces()
|
|
||||||
+
|
|
||||||
+ assert [
|
|
||||||
+ mock.call(net.OVS_INTERNAL_INTERFACE_LOOKUP_CMD)
|
|
||||||
+ ] == m_subp.call_args_list
|
|
||||||
+
|
|
||||||
+ def test_subp_contents_split_and_returned(self, m_subp):
|
|
||||||
+ """Test that the command output is appropriately mangled."""
|
|
||||||
+ stdout = "iface1\niface2\niface3\n"
|
|
||||||
+ m_subp.return_value = (stdout, "")
|
|
||||||
+
|
|
||||||
+ assert [
|
|
||||||
+ "iface1",
|
|
||||||
+ "iface2",
|
|
||||||
+ "iface3",
|
|
||||||
+ ] == net.get_ovs_internal_interfaces()
|
|
||||||
+
|
|
||||||
+ def test_database_connection_error_handled_gracefully(self, m_subp):
|
|
||||||
+ """Test that the error indicating OVS is down is handled gracefully."""
|
|
||||||
+ m_subp.side_effect = ProcessExecutionError(
|
|
||||||
+ stderr="database connection failed"
|
|
||||||
+ )
|
|
||||||
+
|
|
||||||
+ assert [] == net.get_ovs_internal_interfaces()
|
|
||||||
+
|
|
||||||
+ def test_other_errors_raised(self, m_subp):
|
|
||||||
+ """Test that only database connection errors are handled."""
|
|
||||||
+ m_subp.side_effect = ProcessExecutionError()
|
|
||||||
+
|
|
||||||
+ with pytest.raises(ProcessExecutionError):
|
|
||||||
+ net.get_ovs_internal_interfaces()
|
|
||||||
+
|
|
||||||
+ def test_only_runs_once(self, m_subp):
|
|
||||||
+ """Test that we cache the value."""
|
|
||||||
+ net.get_ovs_internal_interfaces()
|
|
||||||
+ net.get_ovs_internal_interfaces()
|
|
||||||
+
|
|
||||||
+ assert 1 == m_subp.call_count
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+@mock.patch("cloudinit.net.get_ovs_internal_interfaces")
|
|
||||||
+@mock.patch("cloudinit.net.openvswitch_is_installed")
|
|
||||||
+class TestIsOpenVSwitchInternalInterface:
|
|
||||||
+ def test_false_if_ovs_not_installed(
|
|
||||||
+ self, m_openvswitch_is_installed, _m_get_ovs_internal_interfaces
|
|
||||||
+ ):
|
|
||||||
+ """Test that OVS' absence returns False."""
|
|
||||||
+ m_openvswitch_is_installed.return_value = False
|
|
||||||
+
|
|
||||||
+ assert not net.is_openvswitch_internal_interface("devname")
|
|
||||||
+
|
|
||||||
+ @pytest.mark.parametrize(
|
|
||||||
+ "detected_interfaces,devname,expected_return",
|
|
||||||
+ [
|
|
||||||
+ ([], "devname", False),
|
|
||||||
+ (["notdevname"], "devname", False),
|
|
||||||
+ (["devname"], "devname", True),
|
|
||||||
+ (["some", "other", "devices", "and", "ours"], "ours", True),
|
|
||||||
+ ],
|
|
||||||
+ )
|
|
||||||
+ def test_return_value_based_on_detected_interfaces(
|
|
||||||
+ self,
|
|
||||||
+ m_openvswitch_is_installed,
|
|
||||||
+ m_get_ovs_internal_interfaces,
|
|
||||||
+ detected_interfaces,
|
|
||||||
+ devname,
|
|
||||||
+ expected_return,
|
|
||||||
+ ):
|
|
||||||
+ """Test that the detected interfaces are used correctly."""
|
|
||||||
+ m_openvswitch_is_installed.return_value = True
|
|
||||||
+ m_get_ovs_internal_interfaces.return_value = detected_interfaces
|
|
||||||
+ assert expected_return == net.is_openvswitch_internal_interface(
|
|
||||||
+ devname
|
|
||||||
+ )
|
|
||||||
+
|
|
||||||
+
|
|
||||||
class TestIsIpAddress:
|
|
||||||
"""Tests for net.is_ip_address.
|
|
||||||
|
|
||||||
diff --git a/cloudinit/sources/helpers/tests/test_openstack.py b/cloudinit/sources/helpers/tests/test_openstack.py
|
|
||||||
index 2bde1e3f..95fb9743 100644
|
|
||||||
--- a/cloudinit/sources/helpers/tests/test_openstack.py
|
|
||||||
+++ b/cloudinit/sources/helpers/tests/test_openstack.py
|
|
||||||
@@ -1,10 +1,15 @@
|
|
||||||
# This file is part of cloud-init. See LICENSE file for license information.
|
|
||||||
# ./cloudinit/sources/helpers/tests/test_openstack.py
|
|
||||||
+from unittest import mock
|
|
||||||
|
|
||||||
from cloudinit.sources.helpers import openstack
|
|
||||||
from cloudinit.tests import helpers as test_helpers
|
|
||||||
|
|
||||||
|
|
||||||
+@mock.patch(
|
|
||||||
+ "cloudinit.net.is_openvswitch_internal_interface",
|
|
||||||
+ mock.Mock(return_value=False)
|
|
||||||
+)
|
|
||||||
class TestConvertNetJson(test_helpers.CiTestCase):
|
|
||||||
|
|
||||||
def test_phy_types(self):
|
|
||||||
diff --git a/cloudinit/sources/tests/test_oracle.py b/cloudinit/sources/tests/test_oracle.py
|
|
||||||
index a7bbdfd9..dcf33b9b 100644
|
|
||||||
--- a/cloudinit/sources/tests/test_oracle.py
|
|
||||||
+++ b/cloudinit/sources/tests/test_oracle.py
|
|
||||||
@@ -173,6 +173,10 @@ class TestIsPlatformViable(test_helpers.CiTestCase):
|
|
||||||
m_read_dmi_data.assert_has_calls([mock.call('chassis-asset-tag')])
|
|
||||||
|
|
||||||
|
|
||||||
+@mock.patch(
|
|
||||||
+ "cloudinit.net.is_openvswitch_internal_interface",
|
|
||||||
+ mock.Mock(return_value=False)
|
|
||||||
+)
|
|
||||||
class TestNetworkConfigFromOpcImds:
|
|
||||||
def test_no_secondary_nics_does_not_mutate_input(self, oracle_ds):
|
|
||||||
oracle_ds._vnics_data = [{}]
|
|
||||||
diff --git a/tests/integration_tests/bugs/test_lp1912844.py b/tests/integration_tests/bugs/test_lp1912844.py
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..efafae50
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/integration_tests/bugs/test_lp1912844.py
|
|
||||||
@@ -0,0 +1,103 @@
|
|
||||||
+"""Integration test for LP: #1912844
|
|
||||||
+
|
|
||||||
+cloud-init should ignore OVS-internal interfaces when performing its own
|
|
||||||
+interface determination: these interfaces are handled fully by OVS, so
|
|
||||||
+cloud-init should never need to touch them.
|
|
||||||
+
|
|
||||||
+This test is a semi-synthetic reproducer for the bug. It uses a similar
|
|
||||||
+network configuration, tweaked slightly to DHCP in a way that will succeed even
|
|
||||||
+on "failed" boots. The exact bug doesn't reproduce with the NoCloud
|
|
||||||
+datasource, because it runs at init-local time (whereas the MAAS datasource,
|
|
||||||
+from the report, runs only at init (network) time): this means that the
|
|
||||||
+networking code runs before OVS creates its interfaces (which happens after
|
|
||||||
+init-local but, of course, before networking is up), and so doesn't generate
|
|
||||||
+the traceback that they cause. We work around this by calling
|
|
||||||
+``get_interfaces_by_mac` directly in the test code.
|
|
||||||
+"""
|
|
||||||
+import pytest
|
|
||||||
+
|
|
||||||
+from tests.integration_tests import random_mac_address
|
|
||||||
+
|
|
||||||
+MAC_ADDRESS = random_mac_address()
|
|
||||||
+
|
|
||||||
+NETWORK_CONFIG = """\
|
|
||||||
+bonds:
|
|
||||||
+ bond0:
|
|
||||||
+ interfaces:
|
|
||||||
+ - enp5s0
|
|
||||||
+ macaddress: {0}
|
|
||||||
+ mtu: 1500
|
|
||||||
+bridges:
|
|
||||||
+ ovs-br:
|
|
||||||
+ interfaces:
|
|
||||||
+ - bond0
|
|
||||||
+ macaddress: {0}
|
|
||||||
+ mtu: 1500
|
|
||||||
+ openvswitch: {{}}
|
|
||||||
+ dhcp4: true
|
|
||||||
+ethernets:
|
|
||||||
+ enp5s0:
|
|
||||||
+ mtu: 1500
|
|
||||||
+ set-name: enp5s0
|
|
||||||
+ match:
|
|
||||||
+ macaddress: {0}
|
|
||||||
+version: 2
|
|
||||||
+vlans:
|
|
||||||
+ ovs-br.100:
|
|
||||||
+ id: 100
|
|
||||||
+ link: ovs-br
|
|
||||||
+ mtu: 1500
|
|
||||||
+ ovs-br.200:
|
|
||||||
+ id: 200
|
|
||||||
+ link: ovs-br
|
|
||||||
+ mtu: 1500
|
|
||||||
+""".format(MAC_ADDRESS)
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+SETUP_USER_DATA = """\
|
|
||||||
+#cloud-config
|
|
||||||
+packages:
|
|
||||||
+- openvswitch-switch
|
|
||||||
+"""
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+@pytest.fixture
|
|
||||||
+def ovs_enabled_session_cloud(session_cloud):
|
|
||||||
+ """A session_cloud wrapper, to use an OVS-enabled image for tests.
|
|
||||||
+
|
|
||||||
+ This implementation is complicated by wanting to use ``session_cloud``s
|
|
||||||
+ snapshot cleanup/retention logic, to avoid having to reimplement that here.
|
|
||||||
+ """
|
|
||||||
+ old_snapshot_id = session_cloud.snapshot_id
|
|
||||||
+ with session_cloud.launch(
|
|
||||||
+ user_data=SETUP_USER_DATA,
|
|
||||||
+ ) as instance:
|
|
||||||
+ instance.instance.clean()
|
|
||||||
+ session_cloud.snapshot_id = instance.snapshot()
|
|
||||||
+
|
|
||||||
+ yield session_cloud
|
|
||||||
+
|
|
||||||
+ try:
|
|
||||||
+ session_cloud.delete_snapshot()
|
|
||||||
+ finally:
|
|
||||||
+ session_cloud.snapshot_id = old_snapshot_id
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+@pytest.mark.lxd_vm
|
|
||||||
+def test_get_interfaces_by_mac_doesnt_traceback(ovs_enabled_session_cloud):
|
|
||||||
+ """Launch our OVS-enabled image and confirm the bug doesn't reproduce."""
|
|
||||||
+ launch_kwargs = {
|
|
||||||
+ "config_dict": {
|
|
||||||
+ "user.network-config": NETWORK_CONFIG,
|
|
||||||
+ "volatile.eth0.hwaddr": MAC_ADDRESS,
|
|
||||||
+ },
|
|
||||||
+ }
|
|
||||||
+ with ovs_enabled_session_cloud.launch(
|
|
||||||
+ launch_kwargs=launch_kwargs,
|
|
||||||
+ ) as client:
|
|
||||||
+ result = client.execute(
|
|
||||||
+ "python3 -c"
|
|
||||||
+ "'from cloudinit.net import get_interfaces_by_mac;"
|
|
||||||
+ "get_interfaces_by_mac()'"
|
|
||||||
+ )
|
|
||||||
+ assert result.ok
|
|
||||||
diff --git a/tests/unittests/test_datasource/test_configdrive.py b/tests/unittests/test_datasource/test_configdrive.py
|
|
||||||
index 6f830cc6..2e2b7847 100644
|
|
||||||
--- a/tests/unittests/test_datasource/test_configdrive.py
|
|
||||||
+++ b/tests/unittests/test_datasource/test_configdrive.py
|
|
||||||
@@ -494,6 +494,10 @@ class TestConfigDriveDataSource(CiTestCase):
|
|
||||||
self.assertEqual('config-disk (/dev/anything)', cfg_ds.subplatform)
|
|
||||||
|
|
||||||
|
|
||||||
+@mock.patch(
|
|
||||||
+ "cloudinit.net.is_openvswitch_internal_interface",
|
|
||||||
+ mock.Mock(return_value=False)
|
|
||||||
+)
|
|
||||||
class TestNetJson(CiTestCase):
|
|
||||||
def setUp(self):
|
|
||||||
super(TestNetJson, self).setUp()
|
|
||||||
@@ -654,6 +658,10 @@ class TestNetJson(CiTestCase):
|
|
||||||
self.assertEqual(out_data, conv_data)
|
|
||||||
|
|
||||||
|
|
||||||
+@mock.patch(
|
|
||||||
+ "cloudinit.net.is_openvswitch_internal_interface",
|
|
||||||
+ mock.Mock(return_value=False)
|
|
||||||
+)
|
|
||||||
class TestConvertNetworkData(CiTestCase):
|
|
||||||
|
|
||||||
with_logs = True
|
|
||||||
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
|
||||||
index c67b5fcc..14d3462f 100644
|
|
||||||
--- a/tests/unittests/test_net.py
|
|
||||||
+++ b/tests/unittests/test_net.py
|
|
||||||
@@ -2908,6 +2908,10 @@ iface eth1 inet dhcp
|
|
||||||
self.assertEqual(0, mock_settle.call_count)
|
|
||||||
|
|
||||||
|
|
||||||
+@mock.patch(
|
|
||||||
+ "cloudinit.net.is_openvswitch_internal_interface",
|
|
||||||
+ mock.Mock(return_value=False)
|
|
||||||
+)
|
|
||||||
class TestRhelSysConfigRendering(CiTestCase):
|
|
||||||
|
|
||||||
with_logs = True
|
|
||||||
@@ -3592,6 +3596,10 @@ USERCTL=no
|
|
||||||
expected, self._render_and_read(network_config=v2data))
|
|
||||||
|
|
||||||
|
|
||||||
+@mock.patch(
|
|
||||||
+ "cloudinit.net.is_openvswitch_internal_interface",
|
|
||||||
+ mock.Mock(return_value=False)
|
|
||||||
+)
|
|
||||||
class TestOpenSuseSysConfigRendering(CiTestCase):
|
|
||||||
|
|
||||||
with_logs = True
|
|
||||||
@@ -5009,6 +5017,10 @@ class TestNetRenderers(CiTestCase):
|
|
||||||
self.assertTrue(result)
|
|
||||||
|
|
||||||
|
|
||||||
+@mock.patch(
|
|
||||||
+ "cloudinit.net.is_openvswitch_internal_interface",
|
|
||||||
+ mock.Mock(return_value=False)
|
|
||||||
+)
|
|
||||||
class TestGetInterfaces(CiTestCase):
|
|
||||||
_data = {'bonds': ['bond1'],
|
|
||||||
'bridges': ['bridge1'],
|
|
||||||
@@ -5158,6 +5170,10 @@ class TestInterfaceHasOwnMac(CiTestCase):
|
|
||||||
self.assertFalse(interface_has_own_mac("eth0"))
|
|
||||||
|
|
||||||
|
|
||||||
+@mock.patch(
|
|
||||||
+ "cloudinit.net.is_openvswitch_internal_interface",
|
|
||||||
+ mock.Mock(return_value=False)
|
|
||||||
+)
|
|
||||||
class TestGetInterfacesByMac(CiTestCase):
|
|
||||||
_data = {'bonds': ['bond1'],
|
|
||||||
'bridges': ['bridge1'],
|
|
||||||
@@ -5314,6 +5330,10 @@ class TestInterfacesSorting(CiTestCase):
|
|
||||||
['enp0s3', 'enp0s8', 'enp0s13', 'enp1s2', 'enp2s0', 'enp2s3'])
|
|
||||||
|
|
||||||
|
|
||||||
+@mock.patch(
|
|
||||||
+ "cloudinit.net.is_openvswitch_internal_interface",
|
|
||||||
+ mock.Mock(return_value=False)
|
|
||||||
+)
|
|
||||||
class TestGetIBHwaddrsByInterface(CiTestCase):
|
|
||||||
|
|
||||||
_ib_addr = '80:00:00:28:fe:80:00:00:00:00:00:00:00:11:22:03:00:33:44:56'
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
|
@ -1,87 +0,0 @@
|
||||||
From bec5fb60ffae3d1137c7261e5571c2751c5dda25 Mon Sep 17 00:00:00 2001
|
|
||||||
From: James Falcon <TheRealFalcon@users.noreply.github.com>
|
|
||||||
Date: Mon, 8 Mar 2021 14:09:47 -0600
|
|
||||||
Subject: Fix requiring device-number on EC2 derivatives (#836)
|
|
||||||
|
|
||||||
#342 (70dbccbb) introduced the ability to determine route-metrics based on
|
|
||||||
the `device-number` provided by the EC2 IMDS. Not all datasources that
|
|
||||||
subclass EC2 will have this attribute, so allow the old behavior if
|
|
||||||
`device-number` is not present.
|
|
||||||
|
|
||||||
LP: #1917875
|
|
||||||
---
|
|
||||||
cloudinit/sources/DataSourceEc2.py | 3 +-
|
|
||||||
.../unittests/test_datasource/test_aliyun.py | 30 +++++++++++++++++++
|
|
||||||
2 files changed, 32 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
|
|
||||||
index 1930a509..a2105dc7 100644
|
|
||||||
--- a/cloudinit/sources/DataSourceEc2.py
|
|
||||||
+++ b/cloudinit/sources/DataSourceEc2.py
|
|
||||||
@@ -765,13 +765,14 @@ def convert_ec2_metadata_network_config(
|
|
||||||
netcfg['ethernets'][nic_name] = dev_config
|
|
||||||
return netcfg
|
|
||||||
# Apply network config for all nics and any secondary IPv4/v6 addresses
|
|
||||||
+ nic_idx = 0
|
|
||||||
for mac, nic_name in sorted(macs_to_nics.items()):
|
|
||||||
nic_metadata = macs_metadata.get(mac)
|
|
||||||
if not nic_metadata:
|
|
||||||
continue # Not a physical nic represented in metadata
|
|
||||||
# device-number is zero-indexed, we want it 1-indexed for the
|
|
||||||
# multiplication on the following line
|
|
||||||
- nic_idx = int(nic_metadata['device-number']) + 1
|
|
||||||
+ nic_idx = int(nic_metadata.get('device-number', nic_idx)) + 1
|
|
||||||
dhcp_override = {'route-metric': nic_idx * 100}
|
|
||||||
dev_config = {'dhcp4': True, 'dhcp4-overrides': dhcp_override,
|
|
||||||
'dhcp6': False,
|
|
||||||
diff --git a/tests/unittests/test_datasource/test_aliyun.py b/tests/unittests/test_datasource/test_aliyun.py
|
|
||||||
index eb2828d5..cab1ac2b 100644
|
|
||||||
--- a/tests/unittests/test_datasource/test_aliyun.py
|
|
||||||
+++ b/tests/unittests/test_datasource/test_aliyun.py
|
|
||||||
@@ -7,6 +7,7 @@ from unittest import mock
|
|
||||||
|
|
||||||
from cloudinit import helpers
|
|
||||||
from cloudinit.sources import DataSourceAliYun as ay
|
|
||||||
+from cloudinit.sources.DataSourceEc2 import convert_ec2_metadata_network_config
|
|
||||||
from cloudinit.tests import helpers as test_helpers
|
|
||||||
|
|
||||||
DEFAULT_METADATA = {
|
|
||||||
@@ -183,6 +184,35 @@ class TestAliYunDatasource(test_helpers.HttprettyTestCase):
|
|
||||||
self.assertEqual(ay.parse_public_keys(public_keys),
|
|
||||||
public_keys['key-pair-0']['openssh-key'])
|
|
||||||
|
|
||||||
+ def test_route_metric_calculated_without_device_number(self):
|
|
||||||
+ """Test that route-metric code works without `device-number`
|
|
||||||
+
|
|
||||||
+ `device-number` is part of EC2 metadata, but not supported on aliyun.
|
|
||||||
+ Attempting to access it will raise a KeyError.
|
|
||||||
+
|
|
||||||
+ LP: #1917875
|
|
||||||
+ """
|
|
||||||
+ netcfg = convert_ec2_metadata_network_config(
|
|
||||||
+ {"interfaces": {"macs": {
|
|
||||||
+ "06:17:04:d7:26:09": {
|
|
||||||
+ "interface-id": "eni-e44ef49e",
|
|
||||||
+ },
|
|
||||||
+ "06:17:04:d7:26:08": {
|
|
||||||
+ "interface-id": "eni-e44ef49f",
|
|
||||||
+ }
|
|
||||||
+ }}},
|
|
||||||
+ macs_to_nics={
|
|
||||||
+ '06:17:04:d7:26:09': 'eth0',
|
|
||||||
+ '06:17:04:d7:26:08': 'eth1',
|
|
||||||
+ }
|
|
||||||
+ )
|
|
||||||
+
|
|
||||||
+ met0 = netcfg['ethernets']['eth0']['dhcp4-overrides']['route-metric']
|
|
||||||
+ met1 = netcfg['ethernets']['eth1']['dhcp4-overrides']['route-metric']
|
|
||||||
+
|
|
||||||
+ # route-metric numbers should be 100 apart
|
|
||||||
+ assert 100 == abs(met0 - met1)
|
|
||||||
+
|
|
||||||
|
|
||||||
class TestIsAliYun(test_helpers.CiTestCase):
|
|
||||||
ALIYUN_PRODUCT = 'Alibaba Cloud ECS'
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
|
@ -0,0 +1,98 @@
|
||||||
|
From 77585bbc6d01399ff88865b55dfb7a47b8640271 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
Date: Thu, 20 May 2021 08:53:55 +0200
|
||||||
|
Subject: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in
|
||||||
|
cloud.cfg
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 113: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg
|
||||||
|
RH-Jira: RHEL-16572
|
||||||
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Commit: [1/1] f506bf58dc5458f50624342ec33bcd390aa0b719 (anisinha/rhel-cloud-init)
|
||||||
|
|
||||||
|
RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-MergeRequest: 10: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg
|
||||||
|
RH-Commit: [1/1] 6da989423b9b6e017afbac2f1af3649b0487310f
|
||||||
|
RH-Bugzilla: 1957532
|
||||||
|
RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
|
||||||
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||||
|
RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||||||
|
|
||||||
|
Currently genkeytypes in cloud.cfg is set to None, so together with
|
||||||
|
ssh_deletekeys=1 cloudinit on first boot it will just delete the existing
|
||||||
|
keys and not generate new ones.
|
||||||
|
|
||||||
|
Just removing that property in cloud.cfg is not enough, because
|
||||||
|
settings.py provides another empty default value that will be used
|
||||||
|
instead, resulting to no key generated even when the property is not defined.
|
||||||
|
|
||||||
|
Removing genkeytypes also in settings.py will default to GENERATE_KEY_NAMES,
|
||||||
|
but since we want only 'rsa', 'ecdsa' and 'ed25519', add back genkeytypes in
|
||||||
|
cloud.cfg with the above defaults.
|
||||||
|
|
||||||
|
Also remove ssh_deletekeys in settings.py as we always need
|
||||||
|
to 1 (and it also defaults to 1).
|
||||||
|
|
||||||
|
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
(cherry picked from commit b545a0cbabe8924d048b7172b30e7aad59ed32d5)
|
||||||
|
(cherry picked from commit 855dec5dcc0892c0f7cedf06b025a794769a2a8d)
|
||||||
|
|
||||||
|
Fix unit test breakage
|
||||||
|
|
||||||
|
Fix unit test breakage due to the downstream change
|
||||||
|
5d6674508c6478fa2c ("rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg")
|
||||||
|
|
||||||
|
X-downstream-only: true
|
||||||
|
Fixes: 5d6674508c6478fa2c ("rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg")
|
||||||
|
|
||||||
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
|
||||||
|
Squashed:
|
||||||
|
commit 1afec9e6008db187d1b675e4473d5a2bf0b3c36b
|
||||||
|
Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
Date: Thu May 20 08:53:55 2021 +0200
|
||||||
|
Subject: [PATCH 49/51] rhel/cloud.cfg: remove ssh_genkeytypes in settings.py
|
||||||
|
and set in cloud.cfg
|
||||||
|
|
||||||
|
From fe6fb1843fe8df75899fe189b9e5f8ce3cd75be1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Date: Fri, 8 Dec 2023 12:50:15 +0530
|
||||||
|
Subject: [PATCH 51/51] Fix unit test breakage
|
||||||
|
|
||||||
|
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
---
|
||||||
|
cloudinit/settings.py | 2 --
|
||||||
|
tests/unittests/cmd/test_main.py | 2 --
|
||||||
|
2 files changed, 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
|
||||||
|
index 87829ff0..3a581e5b 100644
|
||||||
|
--- a/cloudinit/settings.py
|
||||||
|
+++ b/cloudinit/settings.py
|
||||||
|
@@ -56,8 +56,6 @@ CFG_BUILTIN = {
|
||||||
|
"log_cfgs": [],
|
||||||
|
"syslog_fix_perms": [],
|
||||||
|
"mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
|
||||||
|
- "ssh_deletekeys": False,
|
||||||
|
- "ssh_genkeytypes": [],
|
||||||
|
"system_info": {
|
||||||
|
"paths": {
|
||||||
|
"cloud_dir": "/var/lib/cloud",
|
||||||
|
diff --git a/tests/unittests/cmd/test_main.py b/tests/unittests/cmd/test_main.py
|
||||||
|
index c8c2ae81..19d26ebe 100644
|
||||||
|
--- a/tests/unittests/cmd/test_main.py
|
||||||
|
+++ b/tests/unittests/cmd/test_main.py
|
||||||
|
@@ -122,8 +122,6 @@ class TestMain(FilesystemMockingTestCase):
|
||||||
|
"vendor_data": {"enabled": True, "prefix": []},
|
||||||
|
"vendor_data2": {"enabled": True, "prefix": []},
|
||||||
|
"syslog_fix_perms": [],
|
||||||
|
- "ssh_deletekeys": False,
|
||||||
|
- "ssh_genkeytypes": [],
|
||||||
|
"mount_default_fields": [
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -0,0 +1,65 @@
|
||||||
|
From 9da40a7e46e40eb090538f9d8a5aa6049fbbc5b8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Date: Tue, 12 Mar 2024 12:52:10 +0530
|
||||||
|
Subject: [PATCH] Retain exit code in cloud-init status for recoverable errors
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 126: Retain exit code in cloud-init status for recoverable errors
|
||||||
|
RH-Jira: RHEL-28817
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-Commit: [1/1] 8c45ffe77ed8e964c35af4705d65daaf8282038f
|
||||||
|
|
||||||
|
Version 23.4 of cloud-init changed the status code reported by cloud-init for
|
||||||
|
recoverable errors from 0 to 2. Please see the commit
|
||||||
|
70acb7f2a30d58 ("Add support for cloud-init "degraded" state (#4500)")
|
||||||
|
|
||||||
|
This change has the potential to break customers who are expecting a 0 status
|
||||||
|
and where warnings can be expected. Hence, revert the status code from 2 to 0
|
||||||
|
even in case of recoverable errors. This retains the old behavior and hence
|
||||||
|
avoids breaking scripts and software stack that expects 0 on the end user side.
|
||||||
|
|
||||||
|
Cannonical has made a similar change downstream for similar reasons. Please see
|
||||||
|
https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/2048522
|
||||||
|
and the corresponding downstream patch:
|
||||||
|
https://github.com/canonical/cloud-init/pull/4747/commits/adce34bfd214e4eecdf87329486f30f0898dd303
|
||||||
|
|
||||||
|
This patch has limited risk as it narrowly only restores the old status
|
||||||
|
code for recoverable errors and does not modify anything else.
|
||||||
|
|
||||||
|
X-downstream-only: true
|
||||||
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
---
|
||||||
|
cloudinit/cmd/status.py | 2 +-
|
||||||
|
tests/unittests/cmd/test_status.py | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cloudinit/cmd/status.py b/cloudinit/cmd/status.py
|
||||||
|
index f5ee9c11..849c80bc 100644
|
||||||
|
--- a/cloudinit/cmd/status.py
|
||||||
|
+++ b/cloudinit/cmd/status.py
|
||||||
|
@@ -225,7 +225,7 @@ def handle_status_args(name, args) -> int:
|
||||||
|
return 1
|
||||||
|
# Recoverable error
|
||||||
|
elif details.status in UXAppStatusDegradedMap.values():
|
||||||
|
- return 2
|
||||||
|
+ return 0
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/tests/unittests/cmd/test_status.py b/tests/unittests/cmd/test_status.py
|
||||||
|
index 6c85a59a..567b517a 100644
|
||||||
|
--- a/tests/unittests/cmd/test_status.py
|
||||||
|
+++ b/tests/unittests/cmd/test_status.py
|
||||||
|
@@ -636,7 +636,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
|
||||||
|
},
|
||||||
|
None,
|
||||||
|
MyArgs(long=False, wait=False, format="json"),
|
||||||
|
- 2,
|
||||||
|
+ 0,
|
||||||
|
{
|
||||||
|
"boot_status_code": "enabled-by-kernel-cmdline",
|
||||||
|
"datasource": "nocloud",
|
||||||
|
--
|
||||||
|
2.39.3
|
||||||
|
|
|
@ -0,0 +1,242 @@
|
||||||
|
From ce17b057e4bd5dfaa2cc72991736a1b82704488c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Brett Holman <brett.holman@canonical.com>
|
||||||
|
Date: Tue, 23 Jan 2024 11:47:35 -0700
|
||||||
|
Subject: [PATCH] Revert "Use grep for faster parsing of cloud config in
|
||||||
|
ds-identify (#4327)"
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 122: Revert "Use grep for faster parsing of cloud config in ds-identify (#4327)"
|
||||||
|
RH-Jira: RHEL-22248
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
||||||
|
RH-Commit: [1/1] f14ebd0055aad9340249e83381cf976debdbe38d
|
||||||
|
|
||||||
|
This reverts commit 816e05d4830f5e789f1f85ef926e2849156bff3a.
|
||||||
|
|
||||||
|
Reopens LP: 2030729
|
||||||
|
Fixes GH-4794
|
||||||
|
|
||||||
|
(cherry picked from commit 8ff94fe9493ad88344eb8bbf2f023c6ba2db5206)
|
||||||
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
---
|
||||||
|
tests/unittests/test_ds_identify.py | 146 +---------------------------
|
||||||
|
tools/ds-identify | 31 +++---
|
||||||
|
2 files changed, 15 insertions(+), 162 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py
|
||||||
|
index ca206fb5..ba0bf779 100644
|
||||||
|
--- a/tests/unittests/test_ds_identify.py
|
||||||
|
+++ b/tests/unittests/test_ds_identify.py
|
||||||
|
@@ -57,146 +57,6 @@ BLKID_UEFI_UBUNTU = [
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
-DEFAULT_CLOUD_CONFIG = """\
|
||||||
|
-# The top level settings are used as module
|
||||||
|
-# and base configuration.
|
||||||
|
-# A set of users which may be applied and/or used by various modules
|
||||||
|
-# when a 'default' entry is found it will reference the 'default_user'
|
||||||
|
-# from the distro configuration specified below
|
||||||
|
-users:
|
||||||
|
- - default
|
||||||
|
-
|
||||||
|
-# If this is set, 'root' will not be able to ssh in and they
|
||||||
|
-# will get a message to login instead as the default $user
|
||||||
|
-disable_root: true
|
||||||
|
-
|
||||||
|
-# This will cause the set+update hostname module to not operate (if true)
|
||||||
|
-preserve_hostname: false
|
||||||
|
-
|
||||||
|
-# If you use datasource_list array, keep array items in a single line.
|
||||||
|
-# If you use multi line array, ds-identify script won't read array items.
|
||||||
|
-# Example datasource config
|
||||||
|
-# datasource:
|
||||||
|
-# Ec2:
|
||||||
|
-# metadata_urls: [ 'blah.com' ]
|
||||||
|
-# timeout: 5 # (defaults to 50 seconds)
|
||||||
|
-# max_wait: 10 # (defaults to 120 seconds)
|
||||||
|
-
|
||||||
|
-# The modules that run in the 'init' stage
|
||||||
|
-cloud_init_modules:
|
||||||
|
- - migrator
|
||||||
|
- - seed_random
|
||||||
|
- - bootcmd
|
||||||
|
- - write-files
|
||||||
|
- - growpart
|
||||||
|
- - resizefs
|
||||||
|
- - disk_setup
|
||||||
|
- - mounts
|
||||||
|
- - set_hostname
|
||||||
|
- - update_hostname
|
||||||
|
- - update_etc_hosts
|
||||||
|
- - ca-certs
|
||||||
|
- - rsyslog
|
||||||
|
- - users-groups
|
||||||
|
- - ssh
|
||||||
|
-
|
||||||
|
-# The modules that run in the 'config' stage
|
||||||
|
-cloud_config_modules:
|
||||||
|
- - wireguard
|
||||||
|
- - snap
|
||||||
|
- - ubuntu_autoinstall
|
||||||
|
- - ssh-import-id
|
||||||
|
- - keyboard
|
||||||
|
- - locale
|
||||||
|
- - set-passwords
|
||||||
|
- - grub-dpkg
|
||||||
|
- - apt-pipelining
|
||||||
|
- - apt-configure
|
||||||
|
- - ubuntu-advantage
|
||||||
|
- - ntp
|
||||||
|
- - timezone
|
||||||
|
- - disable-ec2-metadata
|
||||||
|
- - runcmd
|
||||||
|
- - byobu
|
||||||
|
-
|
||||||
|
-# The modules that run in the 'final' stage
|
||||||
|
-cloud_final_modules:
|
||||||
|
- - package-update-upgrade-install
|
||||||
|
- - fan
|
||||||
|
- - landscape
|
||||||
|
- - lxd
|
||||||
|
- - ubuntu-drivers
|
||||||
|
- - write-files-deferred
|
||||||
|
- - puppet
|
||||||
|
- - chef
|
||||||
|
- - ansible
|
||||||
|
- - mcollective
|
||||||
|
- - salt-minion
|
||||||
|
- - reset_rmc
|
||||||
|
- - refresh_rmc_and_interface
|
||||||
|
- - rightscale_userdata
|
||||||
|
- - scripts-vendor
|
||||||
|
- - scripts-per-once
|
||||||
|
- - scripts-per-boot
|
||||||
|
- - scripts-per-instance
|
||||||
|
- - scripts-user
|
||||||
|
- - ssh-authkey-fingerprints
|
||||||
|
- - keys-to-console
|
||||||
|
- - install-hotplug
|
||||||
|
- - phone-home
|
||||||
|
- - final-message
|
||||||
|
- - power-state-change
|
||||||
|
-
|
||||||
|
-# System and/or distro specific settings
|
||||||
|
-# (not accessible to handlers/transforms)
|
||||||
|
-system_info:
|
||||||
|
- # This will affect which distro class gets used
|
||||||
|
- distro: ubuntu
|
||||||
|
- # Default user name + that default users groups (if added/used)
|
||||||
|
- default_user:
|
||||||
|
- name: ubuntu
|
||||||
|
- lock_passwd: True
|
||||||
|
- gecos: Ubuntu
|
||||||
|
- groups: [adm, audio, cdrom, floppy, lxd, netdev, plugdev, sudo, video]
|
||||||
|
- sudo: ["ALL=(ALL) NOPASSWD:ALL"]
|
||||||
|
- shell: /bin/bash
|
||||||
|
- network:
|
||||||
|
- renderers: ['netplan', 'eni', 'sysconfig']
|
||||||
|
- activators: ['netplan', 'eni', 'network-manager', 'networkd']
|
||||||
|
- # Automatically discover the best ntp_client
|
||||||
|
- ntp_client: auto
|
||||||
|
- # Other config here will be given to the distro class and/or path classes
|
||||||
|
- paths:
|
||||||
|
- cloud_dir: /var/lib/cloud/
|
||||||
|
- templates_dir: /etc/cloud/templates/
|
||||||
|
- package_mirrors:
|
||||||
|
- - arches: [i386, amd64]
|
||||||
|
- failsafe:
|
||||||
|
- primary: http://archive.ubuntu.com/ubuntu
|
||||||
|
- security: http://security.ubuntu.com/ubuntu
|
||||||
|
- search:
|
||||||
|
- primary:
|
||||||
|
- - http://%(ec2_region)s.ec2.archive.ubuntu.com/ubuntu/
|
||||||
|
- - http://%(availability_zone)s.clouds.archive.ubuntu.com/ubuntu/
|
||||||
|
- - http://%(region)s.clouds.archive.ubuntu.com/ubuntu/
|
||||||
|
- security: []
|
||||||
|
- - arches: [arm64, armel, armhf]
|
||||||
|
- failsafe:
|
||||||
|
- primary: http://ports.ubuntu.com/ubuntu-ports
|
||||||
|
- security: http://ports.ubuntu.com/ubuntu-ports
|
||||||
|
- search:
|
||||||
|
- primary:
|
||||||
|
- - http://%(ec2_region)s.ec2.ports.ubuntu.com/ubuntu-ports/
|
||||||
|
- - http://%(availability_zone)s.clouds.ports.ubuntu.com/ubuntu-ports/
|
||||||
|
- - http://%(region)s.clouds.ports.ubuntu.com/ubuntu-ports/
|
||||||
|
- security: []
|
||||||
|
- - arches: [default]
|
||||||
|
- failsafe:
|
||||||
|
- primary: http://ports.ubuntu.com/ubuntu-ports
|
||||||
|
- security: http://ports.ubuntu.com/ubuntu-ports
|
||||||
|
- ssh_svcname: ssh
|
||||||
|
-"""
|
||||||
|
-
|
||||||
|
POLICY_FOUND_ONLY = "search,found=all,maybe=none,notfound=disabled"
|
||||||
|
POLICY_FOUND_OR_MAYBE = "search,found=all,maybe=all,notfound=disabled"
|
||||||
|
DI_DEFAULT_POLICY = "search,found=all,maybe=all,notfound=disabled"
|
||||||
|
@@ -279,10 +139,6 @@ class DsIdentifyBase(CiTestCase):
|
||||||
|
if files is None:
|
||||||
|
files = {}
|
||||||
|
|
||||||
|
- cloudcfg = "etc/cloud/cloud.cfg"
|
||||||
|
- if cloudcfg not in files:
|
||||||
|
- files[cloudcfg] = DEFAULT_CLOUD_CONFIG
|
||||||
|
-
|
||||||
|
if rootd is None:
|
||||||
|
rootd = self.tmp_dir()
|
||||||
|
|
||||||
|
@@ -1305,7 +1161,7 @@ VALID_CFG = {
|
||||||
|
# Also include a datasource list of more than just
|
||||||
|
# [NoCloud, None], because that would automatically select
|
||||||
|
# NoCloud without checking
|
||||||
|
- "etc/cloud/cloud.cfg": dedent(
|
||||||
|
+ "/etc/cloud/cloud.cfg": dedent(
|
||||||
|
"""\
|
||||||
|
datasource_list: [ Azure, Openstack, NoCloud, None ]
|
||||||
|
datasource:
|
||||||
|
diff --git a/tools/ds-identify b/tools/ds-identify
|
||||||
|
index 7a537278..ec2cc18a 100755
|
||||||
|
--- a/tools/ds-identify
|
||||||
|
+++ b/tools/ds-identify
|
||||||
|
@@ -777,24 +777,21 @@ check_config() {
|
||||||
|
if [ "$1" = "$files" -a ! -f "$1" ]; then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
- local line="" ret="" found=0 found_fn="" oifs="$IFS" out=""
|
||||||
|
- out=$(grep "$key\"\?:" "$@" 2>/dev/null)
|
||||||
|
- IFS=${CR}
|
||||||
|
- for line in $out; do
|
||||||
|
- # drop '# comment'
|
||||||
|
- line=${line%%#*}
|
||||||
|
- # if more than one file was 'grep'ed, then grep will output filename:
|
||||||
|
- # but if only one file, line will not be prefixed.
|
||||||
|
- if [ $# -eq 1 ]; then
|
||||||
|
- found_fn="$1"
|
||||||
|
- else
|
||||||
|
- found_fn="${line%%:*}"
|
||||||
|
- line=${line#*:}
|
||||||
|
- fi
|
||||||
|
- ret=${line#*: };
|
||||||
|
- found=$((found+1))
|
||||||
|
+ local fname="" line="" ret="" found=0 found_fn=""
|
||||||
|
+ # shellcheck disable=2094
|
||||||
|
+ for fname in "$@"; do
|
||||||
|
+ [ -f "$fname" ] || continue
|
||||||
|
+ while read line; do
|
||||||
|
+ line=${line%%#*}
|
||||||
|
+ case "$line" in
|
||||||
|
+ $key:\ *|"${key}":)
|
||||||
|
+ ret=${line#*:};
|
||||||
|
+ ret=${ret# };
|
||||||
|
+ found=$((found+1))
|
||||||
|
+ found_fn="$fname";;
|
||||||
|
+ esac
|
||||||
|
+ done <"$fname"
|
||||||
|
done
|
||||||
|
- IFS="$oifs"
|
||||||
|
if [ $found -ne 0 ]; then
|
||||||
|
_RET="$ret"
|
||||||
|
_RET_fname="$found_fn"
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -0,0 +1,108 @@
|
||||||
|
From 42aad98557bb62ae693f38e5f1e137bcc44f6046 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Date: Tue, 5 Mar 2024 12:42:26 +0530
|
||||||
|
Subject: [PATCH] Revert "systemd: Standardize cloud-init systemd enablement
|
||||||
|
(#4399)"
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 124: Revert "systemd: Standardize cloud-init systemd enablement (#4399)"
|
||||||
|
RH-Jira: RHEL-21290
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-Commit: [1/1] 10da53e761e25ff7d254a4cfb8fb1fd18de8b4ed
|
||||||
|
|
||||||
|
This reverts commit ec7dde8041d4023b09324e84abe37dc766ebbaf6.
|
||||||
|
|
||||||
|
'ConditionEnvironment' clause is not available in RHEL 8.10 systemd and adding
|
||||||
|
the feature would be complicated. Hence reverting the patch seems to be the
|
||||||
|
right thing to do as it was a simple enhancement to make sure all distros use
|
||||||
|
systemd's kernel commandline and file conditionals. We only care about RHEL so
|
||||||
|
the change should not affect us.
|
||||||
|
|
||||||
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
---
|
||||||
|
systemd/cloud-config.service.tmpl | 3 ++-
|
||||||
|
systemd/cloud-final.service.tmpl | 3 ++-
|
||||||
|
systemd/cloud-init-local.service.tmpl | 3 ++-
|
||||||
|
systemd/cloud-init.service.tmpl | 3 ++-
|
||||||
|
systemd/cloud-init.target | 3 ---
|
||||||
|
5 files changed, 8 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/systemd/cloud-config.service.tmpl b/systemd/cloud-config.service.tmpl
|
||||||
|
index 31d9d983..76e50ae1 100644
|
||||||
|
--- a/systemd/cloud-config.service.tmpl
|
||||||
|
+++ b/systemd/cloud-config.service.tmpl
|
||||||
|
@@ -5,9 +5,10 @@ After=network-online.target cloud-config.target
|
||||||
|
After=snapd.seeded.service
|
||||||
|
Before=systemd-user-sessions.service
|
||||||
|
Wants=network-online.target cloud-config.target
|
||||||
|
+{% if variant == "rhel" %}
|
||||||
|
ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
||||||
|
ConditionKernelCommandLine=!cloud-init=disabled
|
||||||
|
-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
|
||||||
|
+{% endif %}
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
diff --git a/systemd/cloud-final.service.tmpl b/systemd/cloud-final.service.tmpl
|
||||||
|
index bcf8b009..85f423ac 100644
|
||||||
|
--- a/systemd/cloud-final.service.tmpl
|
||||||
|
+++ b/systemd/cloud-final.service.tmpl
|
||||||
|
@@ -7,9 +7,10 @@ After=multi-user.target
|
||||||
|
Before=apt-daily.service
|
||||||
|
{% endif %}
|
||||||
|
Wants=network-online.target cloud-config.service
|
||||||
|
+{% if variant == "rhel" %}
|
||||||
|
ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
||||||
|
ConditionKernelCommandLine=!cloud-init=disabled
|
||||||
|
-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
|
||||||
|
+{% endif %}
|
||||||
|
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
|
||||||
|
index 3a1ca7fa..6f3f9d8d 100644
|
||||||
|
--- a/systemd/cloud-init-local.service.tmpl
|
||||||
|
+++ b/systemd/cloud-init-local.service.tmpl
|
||||||
|
@@ -26,9 +26,10 @@ Before=sysinit.target
|
||||||
|
Conflicts=shutdown.target
|
||||||
|
{% endif %}
|
||||||
|
RequiresMountsFor=/var/lib/cloud
|
||||||
|
+{% if variant == "rhel" %}
|
||||||
|
ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
||||||
|
ConditionKernelCommandLine=!cloud-init=disabled
|
||||||
|
-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
|
||||||
|
+{% endif %}
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
|
||||||
|
index bf91164a..26d2e39c 100644
|
||||||
|
--- a/systemd/cloud-init.service.tmpl
|
||||||
|
+++ b/systemd/cloud-init.service.tmpl
|
||||||
|
@@ -38,9 +38,10 @@ Conflicts=shutdown.target
|
||||||
|
Before=shutdown.target
|
||||||
|
Conflicts=shutdown.target
|
||||||
|
{% endif %}
|
||||||
|
+{% if variant == "rhel" %}
|
||||||
|
ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
||||||
|
ConditionKernelCommandLine=!cloud-init=disabled
|
||||||
|
-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
|
||||||
|
+{% endif %}
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
diff --git a/systemd/cloud-init.target b/systemd/cloud-init.target
|
||||||
|
index 30450f7f..760dfee5 100644
|
||||||
|
--- a/systemd/cloud-init.target
|
||||||
|
+++ b/systemd/cloud-init.target
|
||||||
|
@@ -10,6 +10,3 @@
|
||||||
|
[Unit]
|
||||||
|
Description=Cloud-init target
|
||||||
|
After=multi-user.target
|
||||||
|
-ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
||||||
|
-ConditionKernelCommandLine=!cloud-init=disabled
|
||||||
|
-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
|
||||||
|
--
|
||||||
|
2.39.3
|
||||||
|
|
|
@ -0,0 +1,51 @@
|
||||||
|
From 3f138f68a36224dcefd5c16befbc00486b09c8ec Mon Sep 17 00:00:00 2001
|
||||||
|
From: Brett Holman <brett.holman@canonical.com>
|
||||||
|
Date: Mon, 29 Jan 2024 12:03:36 -0700
|
||||||
|
Subject: [PATCH 1/2] ci: Pin pytest<8.0.0. (#4816)
|
||||||
|
|
||||||
|
RH-Author: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-MergeRequest: 123: fix: Add types to network v1 schema (#4841)
|
||||||
|
RH-Jira: RHEL-21323
|
||||||
|
RH-Acked-by: Ani Sinha <None>
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Commit: [1/2] db0348f73893a7bb536e4a3562dc7ef33b2590ad
|
||||||
|
|
||||||
|
The latest pytest release broke some tests in non-obvious ways. Pin
|
||||||
|
the version for now so that CI passes.
|
||||||
|
|
||||||
|
(cherry picked from commit 7c96c9cd9318e816ce4564b58a2c98271363c447)
|
||||||
|
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
---
|
||||||
|
integration-requirements.txt | 2 +-
|
||||||
|
test-requirements.txt | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/integration-requirements.txt b/integration-requirements.txt
|
||||||
|
index 1f8b54a5..c0792d63 100644
|
||||||
|
--- a/integration-requirements.txt
|
||||||
|
+++ b/integration-requirements.txt
|
||||||
|
@@ -7,7 +7,7 @@ pycloudlib>=5.10.0,<1!6
|
||||||
|
# test/unittests/conftest.py to be loaded by our integration-tests tox env
|
||||||
|
# resulting in an unmet dependency issue:
|
||||||
|
# https://github.com/pytest-dev/pytest/issues/11104
|
||||||
|
-pytest!=7.3.2
|
||||||
|
+pytest!=7.3.2,<8.0.0
|
||||||
|
|
||||||
|
packaging
|
||||||
|
passlib
|
||||||
|
diff --git a/test-requirements.txt b/test-requirements.txt
|
||||||
|
index 46a98b4c..3d2480fd 100644
|
||||||
|
--- a/test-requirements.txt
|
||||||
|
+++ b/test-requirements.txt
|
||||||
|
@@ -4,7 +4,7 @@
|
||||||
|
# test/unittests/conftest.py to be loaded by our integration-tests tox env
|
||||||
|
# resulting in an unmet dependency issue:
|
||||||
|
# https://github.com/pytest-dev/pytest/issues/11104
|
||||||
|
-pytest!=7.3.2
|
||||||
|
+pytest!=7.3.2,<8.0.0
|
||||||
|
|
||||||
|
pytest-cov
|
||||||
|
pytest-mock
|
||||||
|
--
|
||||||
|
2.39.3
|
||||||
|
|
|
@ -0,0 +1,110 @@
|
||||||
|
From 720faf533832ba758dcc8436f144168996508c2a Mon Sep 17 00:00:00 2001
|
||||||
|
From: James Falcon <james.falcon@canonical.com>
|
||||||
|
Date: Tue, 6 Feb 2024 09:24:37 -0600
|
||||||
|
Subject: [PATCH 2/2] fix: Add types to network v1 schema (#4841)
|
||||||
|
|
||||||
|
RH-Author: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-MergeRequest: 123: fix: Add types to network v1 schema (#4841)
|
||||||
|
RH-Jira: RHEL-21323
|
||||||
|
RH-Acked-by: Ani Sinha <None>
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Commit: [2/2] a73a68dff5a6ef54dc4e3b3527fc778400a461cc
|
||||||
|
|
||||||
|
Conflicts:
|
||||||
|
For RHEL no log argument as we are not including commit e168b4a1383b6eae9c1dc81411d7684fcbbf7df9
|
||||||
|
|
||||||
|
Even though it has conflicted with our documentation, we have allowed
|
||||||
|
nameserver address to a be a string, mtu to be empty, and nameserver
|
||||||
|
search to be missing. Since we have allowed these, expand our schema
|
||||||
|
and documentation accordingly.
|
||||||
|
|
||||||
|
Fixes GH-4710
|
||||||
|
|
||||||
|
(cherry picked from commit b08193b376552ede5d162d8283310adc783d81bf)
|
||||||
|
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
---
|
||||||
|
.../config/schemas/schema-network-config-v1.json | 13 +++++++++----
|
||||||
|
doc/rtd/reference/network-config-format-v1.rst | 4 ++--
|
||||||
|
tests/unittests/config/test_schema.py | 13 +++++++++++++
|
||||||
|
3 files changed, 24 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cloudinit/config/schemas/schema-network-config-v1.json b/cloudinit/config/schemas/schema-network-config-v1.json
|
||||||
|
index c77885ec..56dc27c9 100644
|
||||||
|
--- a/cloudinit/config/schemas/schema-network-config-v1.json
|
||||||
|
+++ b/cloudinit/config/schemas/schema-network-config-v1.json
|
||||||
|
@@ -24,7 +24,10 @@
|
||||||
|
"description": "The lowercase MAC address of the physical device."
|
||||||
|
},
|
||||||
|
"mtu": {
|
||||||
|
- "type": "integer",
|
||||||
|
+ "type": [
|
||||||
|
+ "integer",
|
||||||
|
+ "null"
|
||||||
|
+ ],
|
||||||
|
"description": "The MTU size in bytes. The ``mtu`` key represents a device's Maximum Transmission Unit, which is the largest size packet or frame, specified in octets (eight-bit bytes), that can be sent in a packet- or frame-based network. Specifying ``mtu`` is optional. Values too small or too large for a device may be ignored by that device."
|
||||||
|
},
|
||||||
|
"subnets": {
|
||||||
|
@@ -384,8 +387,7 @@
|
||||||
|
"additionalProperties": false,
|
||||||
|
"required": [
|
||||||
|
"type",
|
||||||
|
- "address",
|
||||||
|
- "search"
|
||||||
|
+ "address"
|
||||||
|
],
|
||||||
|
"properties": {
|
||||||
|
"type": {
|
||||||
|
@@ -396,7 +398,10 @@
|
||||||
|
},
|
||||||
|
"address": {
|
||||||
|
"description": "List of IPv4 or IPv6 address of nameservers.",
|
||||||
|
- "type": "array",
|
||||||
|
+ "type": [
|
||||||
|
+ "array",
|
||||||
|
+ "string"
|
||||||
|
+ ],
|
||||||
|
"items": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
diff --git a/doc/rtd/reference/network-config-format-v1.rst b/doc/rtd/reference/network-config-format-v1.rst
|
||||||
|
index d267eb94..42f2dc22 100644
|
||||||
|
--- a/doc/rtd/reference/network-config-format-v1.rst
|
||||||
|
+++ b/doc/rtd/reference/network-config-format-v1.rst
|
||||||
|
@@ -252,8 +252,8 @@ Users can specify a ``nameserver`` type. Nameserver dictionaries include
|
||||||
|
the following keys:
|
||||||
|
|
||||||
|
- ``address``: List of IPv4 or IPv6 address of nameservers.
|
||||||
|
-- ``search``: List of hostnames to include in the :file:`resolv.conf` search
|
||||||
|
- path.
|
||||||
|
+- ``search``: Optional. List of hostnames to include in the :file:`resolv.conf`
|
||||||
|
+ search path.
|
||||||
|
- ``interface``: Optional. Ties the nameserver definition to the specified
|
||||||
|
interface. The value specified here must match the ``name`` of an interface
|
||||||
|
defined in this config. If unspecified, this nameserver will be considered
|
||||||
|
diff --git a/tests/unittests/config/test_schema.py b/tests/unittests/config/test_schema.py
|
||||||
|
index 28f0b39d..52667332 100644
|
||||||
|
--- a/tests/unittests/config/test_schema.py
|
||||||
|
+++ b/tests/unittests/config/test_schema.py
|
||||||
|
@@ -2048,6 +2048,19 @@ class TestNetworkSchema:
|
||||||
|
does_not_raise(),
|
||||||
|
id="bond_with_all_known_properties",
|
||||||
|
),
|
||||||
|
+ pytest.param(
|
||||||
|
+ {
|
||||||
|
+ "network": {
|
||||||
|
+ "version": 1,
|
||||||
|
+ "config": [
|
||||||
|
+ {"type": "physical", "name": "eth0", "mtu": None},
|
||||||
|
+ {"type": "nameserver", "address": "8.8.8.8"},
|
||||||
|
+ ],
|
||||||
|
+ }
|
||||||
|
+ },
|
||||||
|
+ does_not_raise(),
|
||||||
|
+ id="GH-4710_mtu_none_and_str_address",
|
||||||
|
+ ),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
def test_network_schema(self, src_config, expectation):
|
||||||
|
--
|
||||||
|
2.39.3
|
||||||
|
|
|
@ -0,0 +1,132 @@
|
||||||
|
From a622a094a1f497c87a66932382265c2dbf1b88a2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: d1r3ct0r <calvin.mwadime@canonical.com>
|
||||||
|
Date: Sat, 20 Jan 2024 02:11:47 +0300
|
||||||
|
Subject: [PATCH 1/2] fix(clean): stop warning when running clean command
|
||||||
|
(#4761)
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 121: fix(clean): stop warning when running clean command (#4761)
|
||||||
|
RH-Jira: RHEL-21530
|
||||||
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Commit: [1/2] f7a20c627afabf00db20c80ecd6e7f577053863b
|
||||||
|
|
||||||
|
When the clean command is run, runparts is called and README in
|
||||||
|
/etc/cloud/clean.d is not executable which leads to a warning.
|
||||||
|
|
||||||
|
No longer deliver the README in our deb package, move content
|
||||||
|
to our online docs. Continue to deliver the /etc/cloud/clean.d
|
||||||
|
directory as it is used by installers like subiquity.
|
||||||
|
|
||||||
|
Fixes: GH-4760
|
||||||
|
(cherry picked from commit da08a260965e35fa63def1cd8b8b472f7c354ffe)
|
||||||
|
|
||||||
|
There is a downstream only change that is squashed with the upstream commit.
|
||||||
|
The spec file under `redhat/` has been updated so as to not include
|
||||||
|
`/etc/cloud/clean.d/README` file. Otherwise, we shall see errors like the
|
||||||
|
following during the build process:
|
||||||
|
|
||||||
|
`error: File not found: /builddir/build/.../etc/cloud/clean.d/README`
|
||||||
|
|
||||||
|
After a rebase, we can only maintain the downstream spec file change as
|
||||||
|
the rest of it is clean cherry-pick from upstream.
|
||||||
|
|
||||||
|
X-downstream-only: true
|
||||||
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
---
|
||||||
|
config/clean.d/README | 18 ------------------
|
||||||
|
doc/rtd/reference/cli.rst | 27 +++++++++++++++++++++++++++
|
||||||
|
packages/redhat/cloud-init.spec.in | 1 -
|
||||||
|
packages/suse/cloud-init.spec.in | 1 -
|
||||||
|
4 files changed, 27 insertions(+), 20 deletions(-)
|
||||||
|
delete mode 100644 config/clean.d/README
|
||||||
|
|
||||||
|
diff --git a/config/clean.d/README b/config/clean.d/README
|
||||||
|
deleted file mode 100644
|
||||||
|
index 9b0feebe..00000000
|
||||||
|
--- a/config/clean.d/README
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,18 +0,0 @@
|
||||||
|
--- cloud-init's clean.d run-parts directory --
|
||||||
|
-
|
||||||
|
-This directory is provided for third party applications which need
|
||||||
|
-additional configuration artifact cleanup from the filesystem when
|
||||||
|
-the command `cloud-init clean` is invoked.
|
||||||
|
-
|
||||||
|
-The `cloud-init clean` operation is typically performed by image creators
|
||||||
|
-when preparing a golden image for clone and redeployment. The clean command
|
||||||
|
-removes any cloud-init semaphores, allowing cloud-init to treat the next
|
||||||
|
-boot of this image as the "first boot". When the image is next booted
|
||||||
|
-cloud-init will performing all initial configuration based on any valid
|
||||||
|
-datasource meta-data and user-data.
|
||||||
|
-
|
||||||
|
-Any executable scripts in this subdirectory will be invoked in lexicographical
|
||||||
|
-order with run-parts by the command: sudo cloud-init clean.
|
||||||
|
-
|
||||||
|
-Typical format of such scripts would be a ##-<some-app> like the following:
|
||||||
|
- /etc/cloud/clean.d/99-live-installer
|
||||||
|
diff --git a/doc/rtd/reference/cli.rst b/doc/rtd/reference/cli.rst
|
||||||
|
index 04e05c55..c36775a8 100644
|
||||||
|
--- a/doc/rtd/reference/cli.rst
|
||||||
|
+++ b/doc/rtd/reference/cli.rst
|
||||||
|
@@ -83,6 +83,33 @@ re-run all stages as it did on first boot.
|
||||||
|
config files for ssh daemon. Argument `network` removes all generated
|
||||||
|
config files for network. `all` removes config files of all types.
|
||||||
|
|
||||||
|
+.. note::
|
||||||
|
+
|
||||||
|
+ Cloud-init provides the directory :file:`/etc/cloud/clean.d/` for third party
|
||||||
|
+ applications which need additional configuration artifact cleanup from
|
||||||
|
+ the fileystem when the `clean` command is invoked.
|
||||||
|
+
|
||||||
|
+ The :command:`clean` operation is typically performed by image creators
|
||||||
|
+ when preparing a golden image for clone and redeployment. The clean command
|
||||||
|
+ removes any cloud-init semaphores, allowing cloud-init to treat the next
|
||||||
|
+ boot of this image as the "first boot". When the image is next booted
|
||||||
|
+ cloud-init will performing all initial configuration based on any valid
|
||||||
|
+ datasource meta-data and user-data.
|
||||||
|
+
|
||||||
|
+ Any executable scripts in this subdirectory will be invoked in lexicographical
|
||||||
|
+ order with run-parts when running the :command:`clean` command.
|
||||||
|
+
|
||||||
|
+ Typical format of such scripts would be a ##-<some-app> like the following:
|
||||||
|
+ :file:`/etc/cloud/clean.d/99-live-installer`
|
||||||
|
+
|
||||||
|
+ An example of a script is:
|
||||||
|
+
|
||||||
|
+ .. code-block:: bash
|
||||||
|
+
|
||||||
|
+ sudo rm -rf /var/lib/installer_imgs/
|
||||||
|
+ sudo rm -rf /var/log/installer/
|
||||||
|
+
|
||||||
|
+
|
||||||
|
.. _cli_collect_logs:
|
||||||
|
|
||||||
|
:command:`collect-logs`
|
||||||
|
diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
|
||||||
|
index 97e95096..accfb1b6 100644
|
||||||
|
--- a/packages/redhat/cloud-init.spec.in
|
||||||
|
+++ b/packages/redhat/cloud-init.spec.in
|
||||||
|
@@ -190,7 +190,6 @@ fi
|
||||||
|
# Configs
|
||||||
|
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg
|
||||||
|
%dir %{_sysconfdir}/cloud/clean.d
|
||||||
|
-%config(noreplace) %{_sysconfdir}/cloud/clean.d/README
|
||||||
|
%dir %{_sysconfdir}/cloud/cloud.cfg.d
|
||||||
|
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg
|
||||||
|
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/README
|
||||||
|
diff --git a/packages/suse/cloud-init.spec.in b/packages/suse/cloud-init.spec.in
|
||||||
|
index 62a9129b..fae3c12b 100644
|
||||||
|
--- a/packages/suse/cloud-init.spec.in
|
||||||
|
+++ b/packages/suse/cloud-init.spec.in
|
||||||
|
@@ -115,7 +115,6 @@ version_pys=$(cd "%{buildroot}" && find . -name version.py -type f)
|
||||||
|
|
||||||
|
# Configs
|
||||||
|
%dir %{_sysconfdir}/cloud/clean.d
|
||||||
|
-%config(noreplace) %{_sysconfdir}/cloud/clean.d/README
|
||||||
|
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg
|
||||||
|
%dir %{_sysconfdir}/cloud/cloud.cfg.d
|
||||||
|
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -0,0 +1,182 @@
|
||||||
|
From 2942fb776cd1fc765089ebd0004e01dc2b3a5920 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Date: Tue, 21 Nov 2023 13:57:15 +0530
|
||||||
|
Subject: [PATCH 2/3] net: allow dhcp6 configuration from
|
||||||
|
generate_fallback_configuration()
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 119: net: allow dhcp6 configuration from generate_fallback_configuration()
|
||||||
|
RH-Jira: RHEL-7277
|
||||||
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
||||||
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-Commit: [2/2] b067c813488dfddc79d8ebd5bb51894ff040c356
|
||||||
|
|
||||||
|
This will make sure on Azure we can use both dhcp4 and dhcp6 when IMDS is not
|
||||||
|
used. This is useful in situations where only ipv6 network is available and
|
||||||
|
there is no dhcp4 running.
|
||||||
|
|
||||||
|
This change is mostly a reversal of commit 29ed5f5b646ee and therefore,
|
||||||
|
re-application of the commit 518047aea9 with some small changes.
|
||||||
|
|
||||||
|
The issue that caused the reversal of 518047aea9 is fixed by the earlier commit:
|
||||||
|
cab0eaf290af7 ("net/network_manager: do not set "may-fail" to False for both ipv4 and ipv6 dhcp")
|
||||||
|
|
||||||
|
Fixes GH-4439
|
||||||
|
|
||||||
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
(cherry picked from commit 0264e969166846b2f5cf87ccdb051a3a795eca15)
|
||||||
|
---
|
||||||
|
cloudinit/net/__init__.py | 7 ++++++-
|
||||||
|
tests/unittests/net/test_init.py | 4 ++++
|
||||||
|
tests/unittests/test_net.py | 24 +++++++++++++++++++++---
|
||||||
|
3 files changed, 31 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
|
||||||
|
index bf21633b..c0888f52 100644
|
||||||
|
--- a/cloudinit/net/__init__.py
|
||||||
|
+++ b/cloudinit/net/__init__.py
|
||||||
|
@@ -571,7 +571,12 @@ def generate_fallback_config(config_driver=None):
|
||||||
|
match = {
|
||||||
|
"macaddress": read_sys_net_safe(target_name, "address").lower()
|
||||||
|
}
|
||||||
|
- cfg = {"dhcp4": True, "set-name": target_name, "match": match}
|
||||||
|
+ cfg = {
|
||||||
|
+ "dhcp4": True,
|
||||||
|
+ "dhcp6": True,
|
||||||
|
+ "set-name": target_name,
|
||||||
|
+ "match": match,
|
||||||
|
+ }
|
||||||
|
if config_driver:
|
||||||
|
driver = device_driver(target_name)
|
||||||
|
if driver:
|
||||||
|
diff --git a/tests/unittests/net/test_init.py b/tests/unittests/net/test_init.py
|
||||||
|
index 561d5151..60a44186 100644
|
||||||
|
--- a/tests/unittests/net/test_init.py
|
||||||
|
+++ b/tests/unittests/net/test_init.py
|
||||||
|
@@ -261,6 +261,7 @@ class TestGenerateFallbackConfig(CiTestCase):
|
||||||
|
"eth1": {
|
||||||
|
"match": {"macaddress": mac},
|
||||||
|
"dhcp4": True,
|
||||||
|
+ "dhcp6": True,
|
||||||
|
"set-name": "eth1",
|
||||||
|
}
|
||||||
|
},
|
||||||
|
@@ -278,6 +279,7 @@ class TestGenerateFallbackConfig(CiTestCase):
|
||||||
|
"eth0": {
|
||||||
|
"match": {"macaddress": mac},
|
||||||
|
"dhcp4": True,
|
||||||
|
+ "dhcp6": True,
|
||||||
|
"set-name": "eth0",
|
||||||
|
}
|
||||||
|
},
|
||||||
|
@@ -293,6 +295,7 @@ class TestGenerateFallbackConfig(CiTestCase):
|
||||||
|
"ethernets": {
|
||||||
|
"eth0": {
|
||||||
|
"dhcp4": True,
|
||||||
|
+ "dhcp6": True,
|
||||||
|
"match": {"macaddress": mac},
|
||||||
|
"set-name": "eth0",
|
||||||
|
}
|
||||||
|
@@ -359,6 +362,7 @@ class TestGenerateFallbackConfig(CiTestCase):
|
||||||
|
"ethernets": {
|
||||||
|
"ens3": {
|
||||||
|
"dhcp4": True,
|
||||||
|
+ "dhcp6": True,
|
||||||
|
"match": {"name": "ens3"},
|
||||||
|
"set-name": "ens3",
|
||||||
|
}
|
||||||
|
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
||||||
|
index 54d053f3..e52c2497 100644
|
||||||
|
--- a/tests/unittests/test_net.py
|
||||||
|
+++ b/tests/unittests/test_net.py
|
||||||
|
@@ -4299,6 +4299,7 @@ class TestGenerateFallbackConfig(CiTestCase):
|
||||||
|
"ethernets": {
|
||||||
|
"eth0": {
|
||||||
|
"dhcp4": True,
|
||||||
|
+ "dhcp6": True,
|
||||||
|
"set-name": "eth0",
|
||||||
|
"match": {
|
||||||
|
"macaddress": "00:11:22:33:44:55",
|
||||||
|
@@ -4383,6 +4384,9 @@ iface lo inet loopback
|
||||||
|
|
||||||
|
auto eth0
|
||||||
|
iface eth0 inet dhcp
|
||||||
|
+
|
||||||
|
+# control-alias eth0
|
||||||
|
+iface eth0 inet6 dhcp
|
||||||
|
"""
|
||||||
|
self.assertEqual(expected.lstrip(), contents.lstrip())
|
||||||
|
|
||||||
|
@@ -4472,6 +4476,9 @@ iface lo inet loopback
|
||||||
|
|
||||||
|
auto eth1
|
||||||
|
iface eth1 inet dhcp
|
||||||
|
+
|
||||||
|
+# control-alias eth1
|
||||||
|
+iface eth1 inet6 dhcp
|
||||||
|
"""
|
||||||
|
self.assertEqual(expected.lstrip(), contents.lstrip())
|
||||||
|
|
||||||
|
@@ -4695,7 +4702,9 @@ class TestRhelSysConfigRendering(CiTestCase):
|
||||||
|
#
|
||||||
|
BOOTPROTO=dhcp
|
||||||
|
DEVICE=eth1000
|
||||||
|
+DHCPV6C=yes
|
||||||
|
HWADDR=07-1c-c6-75-a4-be
|
||||||
|
+IPV6INIT=yes
|
||||||
|
ONBOOT=yes
|
||||||
|
TYPE=Ethernet
|
||||||
|
USERCTL=no
|
||||||
|
@@ -5593,7 +5602,8 @@ class TestOpenSuseSysConfigRendering(CiTestCase):
|
||||||
|
expected_content = """
|
||||||
|
# Created by cloud-init automatically, do not edit.
|
||||||
|
#
|
||||||
|
-BOOTPROTO=dhcp4
|
||||||
|
+BOOTPROTO=dhcp
|
||||||
|
+DHCLIENT6_MODE=managed
|
||||||
|
LLADDR=07-1c-c6-75-a4-be
|
||||||
|
STARTMODE=auto
|
||||||
|
""".lstrip()
|
||||||
|
@@ -5979,7 +5989,11 @@ class TestNetworkManagerRendering(CiTestCase):
|
||||||
|
|
||||||
|
[ipv4]
|
||||||
|
method=auto
|
||||||
|
- may-fail=false
|
||||||
|
+ may-fail=true
|
||||||
|
+
|
||||||
|
+ [ipv6]
|
||||||
|
+ method=auto
|
||||||
|
+ may-fail=true
|
||||||
|
|
||||||
|
"""
|
||||||
|
),
|
||||||
|
@@ -6245,6 +6259,9 @@ iface lo inet loopback
|
||||||
|
|
||||||
|
auto eth1000
|
||||||
|
iface eth1000 inet dhcp
|
||||||
|
+
|
||||||
|
+# control-alias eth1000
|
||||||
|
+iface eth1000 inet6 dhcp
|
||||||
|
"""
|
||||||
|
self.assertEqual(expected.lstrip(), contents.lstrip())
|
||||||
|
|
||||||
|
@@ -6304,6 +6321,7 @@ class TestNetplanNetRendering:
|
||||||
|
ethernets:
|
||||||
|
eth1000:
|
||||||
|
dhcp4: true
|
||||||
|
+ dhcp6: true
|
||||||
|
match:
|
||||||
|
macaddress: 07-1c-c6-75-a4-be
|
||||||
|
set-name: eth1000
|
||||||
|
@@ -7803,7 +7821,7 @@ class TestNetworkdNetRendering(CiTestCase):
|
||||||
|
Name=eth1000
|
||||||
|
MACAddress=07-1c-c6-75-a4-be
|
||||||
|
[Network]
|
||||||
|
- DHCP=ipv4"""
|
||||||
|
+ DHCP=yes"""
|
||||||
|
).rstrip(" ")
|
||||||
|
|
||||||
|
expected = self.create_conf_dict(expected.splitlines())
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -0,0 +1,150 @@
|
||||||
|
From 010cd58942c82e902bc02cb5a34074f6083fc890 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Date: Thu, 23 Nov 2023 12:27:51 +0530
|
||||||
|
Subject: [PATCH 1/3] net/network_manager: do not set "may-fail" to False for
|
||||||
|
both ipv4 and ipv6 dhcp
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 119: net: allow dhcp6 configuration from generate_fallback_configuration()
|
||||||
|
RH-Jira: RHEL-7277
|
||||||
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
||||||
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-Commit: [1/2] be07418f69a4c461e2fa02a72b7b985053af9660
|
||||||
|
|
||||||
|
If "may-fail" is set to False in the Network Manager keyfile for both ipv4
|
||||||
|
and ipv6 for dhcp configuration, it essentially means both ipv4 and ipv6 network
|
||||||
|
initialization using dhcp must succeed for the overall network configuration to
|
||||||
|
succeed. This means, for environments where only ipv4 or ipv6 is available but
|
||||||
|
not both and we need to configure both ipv4 and ipv6 dhcp, the overall
|
||||||
|
network configuration will fail. This is not what we want. When both ipv4
|
||||||
|
and ipv6 dhcp are configured, it is enough for the overall configuration to
|
||||||
|
succeed if any one succeeds.
|
||||||
|
Therefore, set "may-fail" to True for both ipv4 and ipv6 if and only if both
|
||||||
|
ipv4 and ipv6 are configured as dhcp in the Network Manager keyfile and
|
||||||
|
"may-fail" is set to False for both. If both ipv4 and ipv6 are configured
|
||||||
|
in the keyfile and if for any of them "may-fail" is already set to True,then
|
||||||
|
do nothing.
|
||||||
|
All other cases remain same as before.
|
||||||
|
|
||||||
|
Please see discussions in PR #4474.
|
||||||
|
|
||||||
|
Co-authored-by: James Falcon <james.falcon@canonical.com>
|
||||||
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
(cherry picked from commit 29dd5ace73ad60c7452c39b840045fb47fe0711f)
|
||||||
|
---
|
||||||
|
cloudinit/net/network_manager.py | 59 ++++++++++++++++++++++++++++++++
|
||||||
|
tests/unittests/test_net.py | 8 ++---
|
||||||
|
2 files changed, 63 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
|
||||||
|
index 8374cfcc..8a99eb3a 100644
|
||||||
|
--- a/cloudinit/net/network_manager.py
|
||||||
|
+++ b/cloudinit/net/network_manager.py
|
||||||
|
@@ -71,6 +71,57 @@ class NMConnection:
|
||||||
|
if not self.config.has_option(section, option):
|
||||||
|
self.config[section][option] = value
|
||||||
|
|
||||||
|
+ def _config_option_is_set(self, section, option):
|
||||||
|
+ """
|
||||||
|
+ Checks if a config option is set. Returns True if it is,
|
||||||
|
+ else returns False.
|
||||||
|
+ """
|
||||||
|
+ return self.config.has_section(section) and self.config.has_option(
|
||||||
|
+ section, option
|
||||||
|
+ )
|
||||||
|
+
|
||||||
|
+ def _get_config_option(self, section, option):
|
||||||
|
+ """
|
||||||
|
+ Returns the value of a config option if its set,
|
||||||
|
+ else returns None.
|
||||||
|
+ """
|
||||||
|
+ if self._config_option_is_set(section, option):
|
||||||
|
+ return self.config[section][option]
|
||||||
|
+ else:
|
||||||
|
+ return None
|
||||||
|
+
|
||||||
|
+ def _change_set_config_option(self, section, option, value):
|
||||||
|
+ """
|
||||||
|
+ Overrides the value of a config option if its already set.
|
||||||
|
+ Else, if the config option is not set, it does nothing.
|
||||||
|
+ """
|
||||||
|
+ if self._config_option_is_set(section, option):
|
||||||
|
+ self.config[section][option] = value
|
||||||
|
+
|
||||||
|
+ def _set_mayfail_true_if_both_false_dhcp(self):
|
||||||
|
+ """
|
||||||
|
+ If for both ipv4 and ipv6, 'may-fail' is set to be False,
|
||||||
|
+ set it to True for both of them.
|
||||||
|
+ """
|
||||||
|
+ for family in ["ipv4", "ipv6"]:
|
||||||
|
+ if self._get_config_option(family, "may-fail") != "false":
|
||||||
|
+ # if either ipv4 or ipv6 sections are not set/configured,
|
||||||
|
+ # or if both are configured but for either ipv4 or ipv6,
|
||||||
|
+ # 'may-fail' is not 'false', do not do anything.
|
||||||
|
+ return
|
||||||
|
+ if self._get_config_option(family, "method") not in [
|
||||||
|
+ "dhcp",
|
||||||
|
+ "auto",
|
||||||
|
+ ]:
|
||||||
|
+ # if both v4 and v6 are not dhcp, do not do anything.
|
||||||
|
+ return
|
||||||
|
+
|
||||||
|
+ # If we landed here, it means both ipv4 and ipv6 are configured
|
||||||
|
+ # with dhcp/auto and both have 'may-fail' set to 'false'. So set
|
||||||
|
+ # both to 'true'.
|
||||||
|
+ for family in ["ipv4", "ipv6"]:
|
||||||
|
+ self._change_set_config_option(family, "may-fail", "true")
|
||||||
|
+
|
||||||
|
def _set_ip_method(self, family, subnet_type):
|
||||||
|
"""
|
||||||
|
Ensures there's appropriate [ipv4]/[ipv6] for given family
|
||||||
|
@@ -271,6 +322,14 @@ class NMConnection:
|
||||||
|
if family == "ipv4" and "mtu" in subnet:
|
||||||
|
ipv4_mtu = subnet["mtu"]
|
||||||
|
|
||||||
|
+ # we do not want to set may-fail to false for both ipv4 and ipv6 dhcp
|
||||||
|
+ # at the at the same time. This will make the network configuration
|
||||||
|
+ # work only when both ipv4 and ipv6 dhcp succeeds. This may not be
|
||||||
|
+ # what we want. If we have configured both ipv4 and ipv6 dhcp, any one
|
||||||
|
+ # succeeding should be enough. Therefore, if "may-fail" is set to
|
||||||
|
+ # False for both ipv4 and ipv6 dhcp, set them both to True.
|
||||||
|
+ self._set_mayfail_true_if_both_false_dhcp()
|
||||||
|
+
|
||||||
|
if ipv4_mtu is None:
|
||||||
|
ipv4_mtu = device_mtu
|
||||||
|
if not ipv4_mtu == device_mtu:
|
||||||
|
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
||||||
|
index 052b0674..54d053f3 100644
|
||||||
|
--- a/tests/unittests/test_net.py
|
||||||
|
+++ b/tests/unittests/test_net.py
|
||||||
|
@@ -1470,11 +1470,11 @@ NETWORK_CONFIGS = {
|
||||||
|
|
||||||
|
[ipv4]
|
||||||
|
method=auto
|
||||||
|
- may-fail=false
|
||||||
|
+ may-fail=true
|
||||||
|
|
||||||
|
[ipv6]
|
||||||
|
method=auto
|
||||||
|
- may-fail=false
|
||||||
|
+ may-fail=true
|
||||||
|
|
||||||
|
"""
|
||||||
|
),
|
||||||
|
@@ -1642,11 +1642,11 @@ NETWORK_CONFIGS = {
|
||||||
|
|
||||||
|
[ipv6]
|
||||||
|
method=auto
|
||||||
|
- may-fail=false
|
||||||
|
+ may-fail=true
|
||||||
|
|
||||||
|
[ipv4]
|
||||||
|
method=auto
|
||||||
|
- may-fail=false
|
||||||
|
+ may-fail=true
|
||||||
|
|
||||||
|
"""
|
||||||
|
),
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -0,0 +1,123 @@
|
||||||
|
From ffc8f3fbb4c8c14a4ef2b6a99a9ea61da4bedde7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ani Sinha <anisinha@redhat.com>
|
||||||
|
Date: Thu, 7 Dec 2023 02:39:51 +0530
|
||||||
|
Subject: [PATCH 3/3] net/nm: check for presence of ifcfg files when nm
|
||||||
|
connection files are absent (#4645)
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 120: net/nm: check for presence of ifcfg files when nm connection files are absent (#4645)
|
||||||
|
RH-Jira: RHEL-17610
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
||||||
|
RH-Commit: [1/1] e0647418de8b70724a32500f26f544650d701404
|
||||||
|
|
||||||
|
On systems that use network manager to manage connections and activate network
|
||||||
|
interfaces, they may also use ifcfg files for configuring
|
||||||
|
interfaces using ifcfg-rh network manager plugin. When network manager is used
|
||||||
|
as the activator, we need to also check for the presence of ifcfg interface
|
||||||
|
config file when the network manager connection file is absent and if ifcfg-rh
|
||||||
|
plugin is present.
|
||||||
|
Hence, with this change, network manager activator first tries to use network
|
||||||
|
manager connection files to bring up or bring down the interface. If the
|
||||||
|
connection files are not present and if ifcfg-rh plugin is present, it tries to
|
||||||
|
use ifcfg files for the interface. If the plugin or the ifcfg files are not
|
||||||
|
present, the activator fails to activate or deactivate the interface and it
|
||||||
|
bails out with warning log.
|
||||||
|
|
||||||
|
Fixes: GH-4640
|
||||||
|
|
||||||
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||||||
|
(cherry picked from commit d1d5166895da471cff3606c70d4e8ab6eec1c006)
|
||||||
|
---
|
||||||
|
cloudinit/net/activators.py | 7 +++++++
|
||||||
|
cloudinit/net/network_manager.py | 33 ++++++++++++++++++++++++++++++--
|
||||||
|
2 files changed, 38 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cloudinit/net/activators.py b/cloudinit/net/activators.py
|
||||||
|
index e69da40d..dd858862 100644
|
||||||
|
--- a/cloudinit/net/activators.py
|
||||||
|
+++ b/cloudinit/net/activators.py
|
||||||
|
@@ -117,6 +117,13 @@ class NetworkManagerActivator(NetworkActivator):
|
||||||
|
from cloudinit.net.network_manager import conn_filename
|
||||||
|
|
||||||
|
filename = conn_filename(device_name)
|
||||||
|
+ if filename is None:
|
||||||
|
+ LOG.warning(
|
||||||
|
+ "Unable to find an interface config file. "
|
||||||
|
+ "Unable to bring up interface."
|
||||||
|
+ )
|
||||||
|
+ return False
|
||||||
|
+
|
||||||
|
cmd = ["nmcli", "connection", "load", filename]
|
||||||
|
if _alter_interface(cmd, device_name):
|
||||||
|
cmd = ["nmcli", "connection", "up", "filename", filename]
|
||||||
|
diff --git a/cloudinit/net/network_manager.py b/cloudinit/net/network_manager.py
|
||||||
|
index 8a99eb3a..76a0ac15 100644
|
||||||
|
--- a/cloudinit/net/network_manager.py
|
||||||
|
+++ b/cloudinit/net/network_manager.py
|
||||||
|
@@ -17,10 +17,12 @@ from typing import Optional
|
||||||
|
from cloudinit import subp, util
|
||||||
|
from cloudinit.net import is_ipv6_address, renderer, subnet_is_ipv6
|
||||||
|
from cloudinit.net.network_state import NetworkState
|
||||||
|
+from cloudinit.net.sysconfig import available_nm_ifcfg_rh
|
||||||
|
|
||||||
|
NM_RUN_DIR = "/etc/NetworkManager"
|
||||||
|
NM_LIB_DIR = "/usr/lib/NetworkManager"
|
||||||
|
NM_CFG_FILE = "/etc/NetworkManager/NetworkManager.conf"
|
||||||
|
+IFCFG_CFG_FILE = "/etc/sysconfig/network-scripts"
|
||||||
|
NM_IPV6_ADDR_GEN_CONF = """# This is generated by cloud-init. Do not edit.
|
||||||
|
#
|
||||||
|
[.config]
|
||||||
|
@@ -442,7 +444,7 @@ class Renderer(renderer.Renderer):
|
||||||
|
for con_id, conn in self.connections.items():
|
||||||
|
if not conn.valid():
|
||||||
|
continue
|
||||||
|
- name = conn_filename(con_id, target)
|
||||||
|
+ name = nm_conn_filename(con_id, target)
|
||||||
|
util.write_file(name, conn.dump(), 0o600)
|
||||||
|
|
||||||
|
# Select EUI64 to be used by default by NM for creating the address
|
||||||
|
@@ -452,12 +454,39 @@ class Renderer(renderer.Renderer):
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
-def conn_filename(con_id, target=None):
|
||||||
|
+def nm_conn_filename(con_id, target=None):
|
||||||
|
target_con_dir = subp.target_path(target, NM_RUN_DIR)
|
||||||
|
con_file = f"cloud-init-{con_id}.nmconnection"
|
||||||
|
return f"{target_con_dir}/system-connections/{con_file}"
|
||||||
|
|
||||||
|
|
||||||
|
+def sysconfig_conn_filename(devname, target=None):
|
||||||
|
+ target_con_dir = subp.target_path(target, IFCFG_CFG_FILE)
|
||||||
|
+ con_file = f"ifcfg-{devname}"
|
||||||
|
+ return f"{target_con_dir}/{con_file}"
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+def conn_filename(devname):
|
||||||
|
+ """
|
||||||
|
+ This function returns the name of the interface config file.
|
||||||
|
+ It first checks for presence of network manager connection file.
|
||||||
|
+ If absent and ifcfg-rh plugin for network manager is available,
|
||||||
|
+ it returns the name of the ifcfg file if it is present. If the
|
||||||
|
+ plugin is not present or the plugin is present but ifcfg file is
|
||||||
|
+ not, it returns None.
|
||||||
|
+ This function is called from NetworkManagerActivator class in
|
||||||
|
+ activators.py.
|
||||||
|
+ """
|
||||||
|
+ conn_file = nm_conn_filename(devname)
|
||||||
|
+ # If the network manager connection file is absent, also check for
|
||||||
|
+ # presence of ifcfg files for the same interface (if nm-ifcfg-rh plugin is
|
||||||
|
+ # present, network manager can handle ifcfg files). If both network manager
|
||||||
|
+ # connection file and ifcfg files are absent, return None.
|
||||||
|
+ if not os.path.isfile(conn_file) and available_nm_ifcfg_rh():
|
||||||
|
+ conn_file = sysconfig_conn_filename(devname)
|
||||||
|
+ return conn_file if os.path.isfile(conn_file) else None
|
||||||
|
+
|
||||||
|
+
|
||||||
|
def cloud_init_nm_conf_filename(target=None):
|
||||||
|
target_con_dir = subp.target_path(target, NM_RUN_DIR)
|
||||||
|
conf_file = "30-cloud-init-ip6-addr-gen-mode.conf"
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -1,65 +0,0 @@
|
||||||
From abf1adeae8211f5acd87dc63b03b2ed995047efd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
||||||
Date: Thu, 20 May 2021 08:53:55 +0200
|
|
||||||
Subject: [PATCH 1/2] rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and
|
|
||||||
set in cloud.cfg
|
|
||||||
|
|
||||||
RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
||||||
RH-MergeRequest: 10: rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg
|
|
||||||
RH-Commit: [1/1] 6da989423b9b6e017afbac2f1af3649b0487310f
|
|
||||||
RH-Bugzilla: 1957532
|
|
||||||
RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
|
|
||||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
||||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
||||||
RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
|
||||||
|
|
||||||
Currently genkeytypes in cloud.cfg is set to None, so together with
|
|
||||||
ssh_deletekeys=1 cloudinit on first boot it will just delete the existing
|
|
||||||
keys and not generate new ones.
|
|
||||||
|
|
||||||
Just removing that property in cloud.cfg is not enough, because
|
|
||||||
settings.py provides another empty default value that will be used
|
|
||||||
instead, resulting to no key generated even when the property is not defined.
|
|
||||||
|
|
||||||
Removing genkeytypes also in settings.py will default to GENERATE_KEY_NAMES,
|
|
||||||
but since we want only 'rsa', 'ecdsa' and 'ed25519', add back genkeytypes in
|
|
||||||
cloud.cfg with the above defaults.
|
|
||||||
|
|
||||||
Also remove ssh_deletekeys in settings.py as we always need
|
|
||||||
to 1 (and it also defaults to 1).
|
|
||||||
|
|
||||||
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
|
||||||
---
|
|
||||||
cloudinit/settings.py | 2 --
|
|
||||||
rhel/cloud.cfg | 2 +-
|
|
||||||
2 files changed, 1 insertion(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
|
|
||||||
index 43a1490c..2acf2615 100644
|
|
||||||
--- a/cloudinit/settings.py
|
|
||||||
+++ b/cloudinit/settings.py
|
|
||||||
@@ -49,8 +49,6 @@ CFG_BUILTIN = {
|
|
||||||
'def_log_file_mode': 0o600,
|
|
||||||
'log_cfgs': [],
|
|
||||||
'mount_default_fields': [None, None, 'auto', 'defaults,nofail', '0', '2'],
|
|
||||||
- 'ssh_deletekeys': False,
|
|
||||||
- 'ssh_genkeytypes': [],
|
|
||||||
'syslog_fix_perms': [],
|
|
||||||
'system_info': {
|
|
||||||
'paths': {
|
|
||||||
diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg
|
|
||||||
index 9ecba215..cbee197a 100644
|
|
||||||
--- a/rhel/cloud.cfg
|
|
||||||
+++ b/rhel/cloud.cfg
|
|
||||||
@@ -7,7 +7,7 @@ ssh_pwauth: 0
|
|
||||||
mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service', '0', '2']
|
|
||||||
resize_rootfs_tmp: /dev
|
|
||||||
ssh_deletekeys: 1
|
|
||||||
-ssh_genkeytypes: ~
|
|
||||||
+ssh_genkeytypes: ['rsa', 'ecdsa', 'ed25519']
|
|
||||||
syslog_fix_perms: ~
|
|
||||||
disable_vmware_customization: false
|
|
||||||
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
From c43791eeb00bc9000abff0125c18aa6a7e8b7160 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Brett Holman <brett.holman@canonical.com>
|
||||||
|
Date: Tue, 16 Jan 2024 12:43:17 -0700
|
||||||
|
Subject: [PATCH 2/2] test(jsonschema): Pin jsonschema version (#4781)
|
||||||
|
|
||||||
|
RH-Author: Ani Sinha <None>
|
||||||
|
RH-MergeRequest: 121: fix(clean): stop warning when running clean command (#4761)
|
||||||
|
RH-Jira: RHEL-21530
|
||||||
|
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||||
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||||||
|
RH-Commit: [2/2] f864085d47723b3fb462c3b6fc6e24b90bf040aa
|
||||||
|
|
||||||
|
Release 4.21.0 broke tests
|
||||||
|
|
||||||
|
(cherry picked from commit 034a5cdf10582da0492321f861b2b8b42182a54e)
|
||||||
|
---
|
||||||
|
requirements.txt | 2 +-
|
||||||
|
test-requirements.txt | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/requirements.txt b/requirements.txt
|
||||||
|
index edec46a7..a095de18 100644
|
||||||
|
--- a/requirements.txt
|
||||||
|
+++ b/requirements.txt
|
||||||
|
@@ -28,7 +28,7 @@ requests
|
||||||
|
jsonpatch
|
||||||
|
|
||||||
|
# For validating cloud-config sections per schema definitions
|
||||||
|
-jsonschema
|
||||||
|
+jsonschema<=4.20.0
|
||||||
|
|
||||||
|
# Used by DataSourceVMware to inspect the host's network configuration during
|
||||||
|
# the "setup()" function.
|
||||||
|
diff --git a/test-requirements.txt b/test-requirements.txt
|
||||||
|
index 19488b94..46a98b4c 100644
|
||||||
|
--- a/test-requirements.txt
|
||||||
|
+++ b/test-requirements.txt
|
||||||
|
@@ -9,6 +9,6 @@ pytest!=7.3.2
|
||||||
|
pytest-cov
|
||||||
|
pytest-mock
|
||||||
|
setuptools
|
||||||
|
-jsonschema
|
||||||
|
+jsonschema<=4.20.0
|
||||||
|
responses
|
||||||
|
passlib
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
|
@ -5,27 +5,40 @@
|
||||||
%global debug_package %{nil}
|
%global debug_package %{nil}
|
||||||
|
|
||||||
Name: cloud-init
|
Name: cloud-init
|
||||||
Version: 21.1
|
Version: 23.4
|
||||||
Release: 2%{?dist}
|
Release: 7%{?dist}
|
||||||
Summary: Cloud instance init scripts
|
Summary: Cloud instance init scripts
|
||||||
|
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
License: GPLv3
|
License: GPLv3
|
||||||
URL: http://launchpad.net/cloud-init
|
URL: https://github.com/canonical/cloud-init
|
||||||
Source0: https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz
|
Source0: https://github.com/canonical/cloud-init/archive/refs/tags/%{version}.tar.gz
|
||||||
Source1: cloud-init-tmpfiles.conf
|
Source1: cloud-init-tmpfiles.conf
|
||||||
|
|
||||||
Patch0001: 0001-Add-initial-redhat-setup.patch
|
Patch0003: 0003-Do-not-write-NM_CONTROLLED-no-in-generated-interface.patch
|
||||||
Patch0002: 0002-Do-not-write-NM_CONTROLLED-no-in-generated-interface.patch
|
Patch0004: 0004-include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
|
||||||
Patch0003: 0003-limit-permissions-on-def_log_file.patch
|
Patch0005: 0005-settings.py-update-settings-for-rhel.patch
|
||||||
Patch0004: 0004-sysconfig-Don-t-write-BOOTPROTO-dhcp-for-ipv6-dhcp.patch
|
Patch0013: 0013-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch
|
||||||
Patch0005: 0005-DataSourceAzure.py-use-hostnamectl-to-set-hostname.patch
|
# For RHEL-7277 - [RFE] [Azure][RHEL8][Network][cloud-init] Can not acquire IPv6 address
|
||||||
Patch0006: 0006-include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
|
Patch14: ci-net-network_manager-do-not-set-may-fail-to-False-for.patch
|
||||||
Patch0007: 0007-Remove-race-condition-between-cloud-init-and-Network.patch
|
# For RHEL-7277 - [RFE] [Azure][RHEL8][Network][cloud-init] Can not acquire IPv6 address
|
||||||
Patch0008: 0008-net-exclude-OVS-internal-interfaces-in-get_interface.patch
|
Patch15: ci-net-allow-dhcp6-configuration-from-generate_fallback.patch
|
||||||
Patch0009: 0009-Fix-requiring-device-number-on-EC2-derivatives-836.patch
|
# For RHEL-17610 - [RHEL-8] NetworkManagerActivator brings up interface failed when using sysconfig renderer
|
||||||
# For bz#1957532 - [cloud-init] From RHEL 82+ cloud-init no longer displays sshd keys fingerprints from instance launched from a backup image
|
Patch16: ci-net-nm-check-for-presence-of-ifcfg-files-when-nm-con.patch
|
||||||
Patch10: ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch
|
# For RHEL-21530 - [RHEL-8.10]subp.py[WARNING]: skipping /etc/cloud/clean.d/README when do cloud-init clean
|
||||||
|
Patch17: ci-fix-clean-stop-warning-when-running-clean-command-47.patch
|
||||||
|
# For RHEL-21530 - [RHEL-8.10]subp.py[WARNING]: skipping /etc/cloud/clean.d/README when do cloud-init clean
|
||||||
|
Patch18: ci-test-jsonschema-Pin-jsonschema-version-4781.patch
|
||||||
|
# For RHEL-22248 - [Azure][RHEL-8] cloud-init-23.4 cannot read "- Azure" datasource_list format
|
||||||
|
Patch19: ci-Revert-Use-grep-for-faster-parsing-of-cloud-config-i.patch
|
||||||
|
# For RHEL-21323 - [rhel-8] The schema WARNING info for network-config.json is not suitable in cloud-init-23.4
|
||||||
|
Patch20: ci-ci-Pin-pytest-8.0.0.-4816.patch
|
||||||
|
# For RHEL-21323 - [rhel-8] The schema WARNING info for network-config.json is not suitable in cloud-init-23.4
|
||||||
|
Patch21: ci-fix-Add-types-to-network-v1-schema-4841.patch
|
||||||
|
# For RHEL-21290 - Unknown lvalue 'ConditionEnvironment' in section 'Unit' for /usr/lib/systemd/system/cloud-init.target,cloud-init.service
|
||||||
|
Patch22: ci-Revert-systemd-Standardize-cloud-init-systemd-enable.patch
|
||||||
|
# For RHEL-28817 - [RHEL 8.10] cloud-init 23.4 returns 2 on recoverable errors instead of 0
|
||||||
|
Patch23: ci-Retain-exit-code-in-cloud-init-status-for-recoverabl.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
|
@ -73,6 +86,11 @@ Requires: python3-six
|
||||||
Requires: shadow-utils
|
Requires: shadow-utils
|
||||||
Requires: util-linux
|
Requires: util-linux
|
||||||
Requires: xfsprogs
|
Requires: xfsprogs
|
||||||
|
Requires: dhcp-client
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2039697
|
||||||
|
Requires: gdisk
|
||||||
|
Requires: openssl
|
||||||
|
Requires: python3-netifaces
|
||||||
|
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
|
|
||||||
|
@ -96,8 +114,6 @@ sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \
|
||||||
%install
|
%install
|
||||||
%py3_install --
|
%py3_install --
|
||||||
|
|
||||||
python3 tools/render-cloudcfg --variant fedora > $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg
|
|
||||||
|
|
||||||
sed -i "s,@@PACKAGED_VERSION@@,%{version}-%{release}," $RPM_BUILD_ROOT/%{python3_sitelib}/cloudinit/version.py
|
sed -i "s,@@PACKAGED_VERSION@@,%{version}-%{release}," $RPM_BUILD_ROOT/%{python3_sitelib}/cloudinit/version.py
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/var/lib/cloud
|
mkdir -p $RPM_BUILD_ROOT/var/lib/cloud
|
||||||
|
@ -107,27 +123,14 @@ mkdir -p $RPM_BUILD_ROOT/run/cloud-init
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
|
mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
|
||||||
cp -p %{SOURCE1} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf
|
cp -p %{SOURCE1} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf
|
||||||
|
|
||||||
# We supply our own config file since our software differs from Ubuntu's.
|
|
||||||
cp -p rhel/cloud.cfg $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg
|
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d
|
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d
|
||||||
cp -p tools/21-cloudinit.conf $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf
|
cp -p tools/21-cloudinit.conf $RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf
|
||||||
|
|
||||||
# Make installed NetworkManager hook name less generic
|
|
||||||
mv $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/hook-network-manager \
|
|
||||||
$RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/cloud-init-azure-hook
|
|
||||||
|
|
||||||
# Install our own systemd units (rhbz#1440831)
|
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
|
|
||||||
cp rhel/systemd/* $RPM_BUILD_ROOT%{_unitdir}/
|
|
||||||
|
|
||||||
[ ! -d $RPM_BUILD_ROOT/usr/lib/systemd/system-generators ] && mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system-generators
|
[ ! -d $RPM_BUILD_ROOT/usr/lib/systemd/system-generators ] && mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system-generators
|
||||||
python3 tools/render-cloudcfg --variant rhel systemd/cloud-init-generator.tmpl > $RPM_BUILD_ROOT/usr/lib/systemd/system-generators/cloud-init-generator
|
python3 tools/render-template --variant rhel systemd/cloud-init-generator.tmpl > $RPM_BUILD_ROOT/usr/lib/systemd/system-generators/cloud-init-generator
|
||||||
chmod 755 $RPM_BUILD_ROOT/usr/lib/systemd/system-generators/cloud-init-generator
|
chmod 755 $RPM_BUILD_ROOT/usr/lib/systemd/system-generators/cloud-init-generator
|
||||||
|
|
||||||
[ ! -d $RPM_BUILD_ROOT/usr/lib/%{name} ] && mkdir -p $RPM_BUILD_ROOT/usr/lib/%{name}
|
|
||||||
cp -p tools/ds-identify $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ds-identify
|
|
||||||
|
|
||||||
# installing man pages
|
# installing man pages
|
||||||
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1/
|
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1/
|
||||||
for man in cloud-id.1 cloud-init.1 cloud-init-per.1; do
|
for man in cloud-id.1 cloud-init.1 cloud-init-per.1; do
|
||||||
|
@ -149,7 +152,27 @@ if [ $1 -eq 1 ] ; then
|
||||||
/bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || :
|
/bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || :
|
||||||
/bin/systemctl enable cloud-init.target >/dev/null 2>&1 || :
|
/bin/systemctl enable cloud-init.target >/dev/null 2>&1 || :
|
||||||
elif [ $1 -eq 2 ]; then
|
elif [ $1 -eq 2 ]; then
|
||||||
# Upgrade. If the upgrade is from a version older than 0.7.9-8,
|
# 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
|
# there will be stale systemd config
|
||||||
/bin/systemctl is-enabled cloud-config.service >/dev/null 2>&1 &&
|
/bin/systemctl is-enabled cloud-config.service >/dev/null 2>&1 &&
|
||||||
/bin/systemctl reenable cloud-config.service >/dev/null 2>&1 || :
|
/bin/systemctl reenable cloud-config.service >/dev/null 2>&1 || :
|
||||||
|
@ -181,9 +204,23 @@ fi
|
||||||
%postun
|
%postun
|
||||||
%systemd_postun cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service
|
%systemd_postun cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service
|
||||||
|
|
||||||
|
if [ $1 -eq 0 ] ; then
|
||||||
|
# warn during package removal not upgrade
|
||||||
|
if [ -f /etc/ssh/sshd_config.d/50-cloud-init.conf ] ; then
|
||||||
|
echo "/etc/ssh/sshd_config.d/50-cloud-init.conf not removed"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -f /etc/NetworkManager/conf.d/99-cloud-init.conf ] ; then
|
||||||
|
echo "/etc/NetworkManager/conf.d/99-cloud-init.conf not removed"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -f /etc/NetworkManager/conf.d/30-cloud-init-ip6-addr-gen-mode.conf ] ; then
|
||||||
|
echo "/etc/NetworkManager/conf.d/30-cloud-init-ip6-addr-gen-mode.conf not removed"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%doc ChangeLog rhel/README.rhel
|
|
||||||
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg
|
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg
|
||||||
%dir %{_sysconfdir}/cloud/cloud.cfg.d
|
%dir %{_sysconfdir}/cloud/cloud.cfg.d
|
||||||
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg
|
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg
|
||||||
|
@ -193,6 +230,8 @@ fi
|
||||||
%{_unitdir}/cloud-config.service
|
%{_unitdir}/cloud-config.service
|
||||||
%{_unitdir}/cloud-config.target
|
%{_unitdir}/cloud-config.target
|
||||||
%{_unitdir}/cloud-final.service
|
%{_unitdir}/cloud-final.service
|
||||||
|
%{_unitdir}/cloud-init-hotplugd.service
|
||||||
|
%{_unitdir}/cloud-init-hotplugd.socket
|
||||||
%{_unitdir}/cloud-init-local.service
|
%{_unitdir}/cloud-init-local.service
|
||||||
%{_unitdir}/cloud-init.service
|
%{_unitdir}/cloud-init.service
|
||||||
%{_unitdir}/cloud-init.target
|
%{_unitdir}/cloud-init.target
|
||||||
|
@ -204,18 +243,260 @@ fi
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
%dir %verify(not mode) /run/cloud-init
|
%dir %verify(not mode) /run/cloud-init
|
||||||
%dir /var/lib/cloud
|
%dir /var/lib/cloud
|
||||||
/etc/NetworkManager/dispatcher.d/cloud-init-azure-hook
|
|
||||||
%{_udevrulesdir}/66-azure-ephemeral.rules
|
%{_udevrulesdir}/66-azure-ephemeral.rules
|
||||||
%{_sysconfdir}/bash_completion.d/cloud-init
|
%{_datadir}/bash-completion/completions/cloud-init
|
||||||
%{_bindir}/cloud-id
|
%{_bindir}/cloud-id
|
||||||
%{_libexecdir}/%{name}/ds-identify
|
|
||||||
/usr/lib/systemd/system-generators/cloud-init-generator
|
/usr/lib/systemd/system-generators/cloud-init-generator
|
||||||
|
%{_sysconfdir}/systemd/system/sshd-keygen@.service.d/disable-sshd-keygen-if-cloud-init-active.conf
|
||||||
|
|
||||||
|
|
||||||
%dir %{_sysconfdir}/rsyslog.d
|
%dir %{_sysconfdir}/rsyslog.d
|
||||||
%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
|
%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 14 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-7
|
||||||
|
- ci-Retain-exit-code-in-cloud-init-status-for-recoverabl.patch [RHEL-28817]
|
||||||
|
- Resolves: RHEL-28817
|
||||||
|
([RHEL 8.10] cloud-init 23.4 returns 2 on recoverable errors instead of 0)
|
||||||
|
|
||||||
|
* Mon Mar 11 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-6
|
||||||
|
- ci-Revert-systemd-Standardize-cloud-init-systemd-enable.patch [RHEL-21290]
|
||||||
|
- Resolves: RHEL-21290
|
||||||
|
(Unknown lvalue 'ConditionEnvironment' in section 'Unit' for /usr/lib/systemd/system/cloud-init.target,cloud-init.service)
|
||||||
|
|
||||||
|
* Mon Feb 26 2024 Miroslav Rezanina <mrezanin@redhat.com> - 23.4-5
|
||||||
|
- ci-ci-Pin-pytest-8.0.0.-4816.patch [RHEL-21323]
|
||||||
|
- ci-fix-Add-types-to-network-v1-schema-4841.patch [RHEL-21323]
|
||||||
|
- Resolves: RHEL-21323
|
||||||
|
([rhel-8] The schema WARNING info for network-config.json is not suitable in cloud-init-23.4)
|
||||||
|
|
||||||
|
* Fri Feb 02 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-4
|
||||||
|
- ci-Revert-Use-grep-for-faster-parsing-of-cloud-config-i.patch [RHEL-22248]
|
||||||
|
- Resolves: RHEL-22248
|
||||||
|
([Azure][RHEL-8] cloud-init-23.4 cannot read "- Azure" datasource_list format)
|
||||||
|
|
||||||
|
* Fri Feb 02 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-3
|
||||||
|
- ci-fix-clean-stop-warning-when-running-clean-command-47.patch [RHEL-21530]
|
||||||
|
- ci-test-jsonschema-Pin-jsonschema-version-4781.patch [RHEL-21530]
|
||||||
|
- Resolves: RHEL-21530
|
||||||
|
([RHEL-8.10]subp.py[WARNING]: skipping /etc/cloud/clean.d/README when do cloud-init clean)
|
||||||
|
|
||||||
|
* Tue Jan 16 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-2
|
||||||
|
- ci-net-network_manager-do-not-set-may-fail-to-False-for.patch [RHEL-7277]
|
||||||
|
- ci-net-allow-dhcp6-configuration-from-generate_fallback.patch [RHEL-7277]
|
||||||
|
- ci-net-nm-check-for-presence-of-ifcfg-files-when-nm-con.patch [RHEL-17610]
|
||||||
|
- Resolves: RHEL-7277
|
||||||
|
([RFE] [Azure][RHEL8][Network][cloud-init] Can not acquire IPv6 address)
|
||||||
|
- Resolves: RHEL-17610
|
||||||
|
([RHEL-8] NetworkManagerActivator brings up interface failed when using sysconfig renderer)
|
||||||
|
|
||||||
|
* Mon Jan 8 2024 Jon Maloy <jmaloy@redhat.com> - 23.4-1
|
||||||
|
- Rebase to 23.4.1 [RHEL-18314]
|
||||||
|
- Resolves: RHEL-18314
|
||||||
|
([RHEL-8]Rebase cloud-init to 23.4)
|
||||||
|
|
||||||
|
* Thu Nov 23 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-12
|
||||||
|
- ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch [RHEL-16572]
|
||||||
|
- Resolves: RHEL-16572
|
||||||
|
([cloud-init][rhel-8] Backport the patch "rhel/cloud.cfg: remove ssh_genkeytypes in settings.py and set in cloud.cfg" to fix settings.py)
|
||||||
|
|
||||||
|
* Mon Sep 18 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-11
|
||||||
|
- ci-net-fix-ipv6_dhcpv6_stateful-stateless-slaac-configu.patch [bz#2046491]
|
||||||
|
- Resolves: bz#2046491
|
||||||
|
(cloud-init enable both DHCPv4 and DHCPv6 when network type is ipv6_dhcpv6-stateful/ipv6_dhcpv6-stateless)
|
||||||
|
- Resolves: RHEL-2325
|
||||||
|
([RHEL8.9][cloud-init] Not inform user during upgrade that cloud-init generated config files are left )
|
||||||
|
|
||||||
|
* Fri Aug 25 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-10
|
||||||
|
- Resolves: bz#2233047
|
||||||
|
([RHEL 8.9] Inform user when cloud-init generated config files are left during uninstalling)
|
||||||
|
|
||||||
|
* Wed Aug 09 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-9
|
||||||
|
- ci-NM-renderer-set-default-IPv6-addr-gen-mode-for-all-i.patch [bz#2229460]
|
||||||
|
- Resolves: bz#2229460
|
||||||
|
([rhel-8.9] [RFE] Configure "ipv6.addr-gen-mode=eui64' as default in NetworkManager)
|
||||||
|
|
||||||
|
* Thu Jul 27 2023 Camilla Conte <cconte@redhat.com> - 23.1.1-8
|
||||||
|
- ci-DS-VMware-modify-a-few-log-level-4284.patch [bz#2223810]
|
||||||
|
- Resolves: bz#2223810
|
||||||
|
([cloud-init] [RHEL8.9]There are warning logs if dev has more than one IPV6 address on ESXi)
|
||||||
|
|
||||||
|
* Tue Jul 25 2023 Miroslav Rezanina <mrezanin@redhat.com> - 23.1.1-7
|
||||||
|
- ci-logging-keep-current-file-mode-of-log-file-if-its-st.patch [bz#2222501]
|
||||||
|
- Resolves: bz#2222501
|
||||||
|
(Don't change log permissions if they are already more restrictive [rhel-8])
|
||||||
|
|
||||||
|
* Mon Jul 10 2023 Miroslav Rezanina <mrezanin@redhat.com> - 23.1.1-6
|
||||||
|
- ci-Revert-Manual-revert-Use-Network-Manager-and-Netplan.patch [bz#2219528]
|
||||||
|
- ci-Revert-Revert-Add-native-NetworkManager-support-1224.patch [bz#2219528]
|
||||||
|
- ci-nm-generate-ipv6-stateful-dhcp-config-at-par-with-sy.patch [bz#2219528]
|
||||||
|
- ci-network_manager-add-a-method-for-ipv6-static-IP-conf.patch [bz#2219528]
|
||||||
|
- ci-net-sysconfig-enable-sysconfig-renderer-if-network-m.patch [bz#2219528]
|
||||||
|
- ci-network-manager-Set-higher-autoconnect-priority-for-.patch [bz#2219528]
|
||||||
|
- ci-Set-default-renderer-as-sysconfig-for-centos-rhel-41.patch [bz#2219528]
|
||||||
|
- Resolves: bz#2219528
|
||||||
|
([RHEL8] Support configuring network by NM keyfiles)
|
||||||
|
|
||||||
|
* Thu Jun 29 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-4
|
||||||
|
- ci-Add-warning-during-upgrade-from-an-old-version-with-.patch [bz#2210012]
|
||||||
|
- Resolves: bz#2210012
|
||||||
|
([cloud-init] System didn't generate ssh host keys and lost ssh connection after cloud-init removed them with updated cloud-init package.)
|
||||||
|
|
||||||
|
* Wed May 03 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-3
|
||||||
|
- ci-Don-t-change-permissions-of-netrules-target-2076.patch [bz#2182947]
|
||||||
|
- ci-Make-user-vendor-data-sensitive-and-remove-log-permi.patch [bz#2190081]
|
||||||
|
- Resolves: bz#2182947
|
||||||
|
(Request to backport "Don't change permissions of netrules target (#2076)")
|
||||||
|
- Resolves: bz#2190081
|
||||||
|
(CVE-2023-1786 cloud-init: sensitive data could be exposed in logs [rhel-8])
|
||||||
|
|
||||||
|
* Tue Apr 25 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-2
|
||||||
|
- ci-rhel-make-sure-previous-hostname-file-ends-with-a-ne.patch [bz#2182407]
|
||||||
|
- Resolves: bz#2182407
|
||||||
|
(cloud-init strips new line from "/etc/hostname" when processing "/var/lib/cloud/data/previous-hostname")
|
||||||
|
|
||||||
|
* Fri Apr 21 2023 Jon Maloy <jmaloy@redhat.com> - 23.1.1-1
|
||||||
|
- limit-permissions-on-def_log_file.patch
|
||||||
|
- Resolves bz#1424612
|
||||||
|
- include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
|
||||||
|
- Resolves bz#1653131
|
||||||
|
- Rebase to 23.1.1 [bz#2172821]
|
||||||
|
- Resolves: bz#2172821
|
||||||
|
|
||||||
|
* Mon Jan 30 2023 Camilla Conte <cconte@redhat.com> - 22.1-8
|
||||||
|
- ci-cc_set_hostname-ignore-var-lib-cloud-data-set-hostna.patch [bz#2162258]
|
||||||
|
- Resolves: bz#2162258
|
||||||
|
(systemd[1]: Failed to start Initial cloud-init job after reboot system via sysrq 'b' [RHEL-8])
|
||||||
|
|
||||||
|
* Wed Dec 28 2022 Camilla Conte <cconte@redhat.com> - 22.1-7
|
||||||
|
- ci-Ensure-network-ready-before-cloud-init-service-runs-.patch [bz#2151861]
|
||||||
|
- Resolves: bz#2151861
|
||||||
|
([RHEL-8] Ensure network ready before cloud-init service runs on RHEL)
|
||||||
|
|
||||||
|
* Mon Oct 17 2022 Jon Maloy <jmaloy@redhat.com> - 22.1-6
|
||||||
|
- ci-cloud.cfg.tmpl-make-sure-centos-settings-are-identic.patch [bz#2115576]
|
||||||
|
- Resolves: bz#2115576
|
||||||
|
(cloud-init configures user "centos" or "rhel" instead of "cloud-user" with cloud-init-22.1)
|
||||||
|
|
||||||
|
* Wed Aug 17 2022 Jon Maloy <jmaloy@redhat.com> - 22.1-5
|
||||||
|
- ci-Revert-Add-native-NetworkManager-support-1224.patch [bz#2107464 bz#2110066 bz#2117526 bz#2104393 bz#2098624]
|
||||||
|
- ci-Revert-Use-Network-Manager-and-Netplan-as-default-re.patch [bz#2107464 bz#2110066 bz#2117526 bz#2104393 bz#2098624]
|
||||||
|
- Resolves: bz#2107464
|
||||||
|
([RHEL-8.7] Cannot run sysconfig when changing the priority of network renderers)
|
||||||
|
- Resolves: bz#2110066
|
||||||
|
(DNS integration with OpenStack/cloud-init/NetworkManager is not working)
|
||||||
|
- Resolves: bz#2117526
|
||||||
|
([RHEL8.7] Revert patch of configuring networking by NM keyfiles)
|
||||||
|
- Resolves: bz#2104393
|
||||||
|
([RHEL-8.7]Failed to config static IP and IPv6 according to VMware Customization Config File)
|
||||||
|
- Resolves: bz#2098624
|
||||||
|
([RHEL-8.7] IPv6 not workable when cloud-init configure network using NM keyfiles)
|
||||||
|
|
||||||
|
* Tue Jul 12 2022 Miroslav Rezanina <mrezanin@redhat.com> - 22.1-4
|
||||||
|
- ci-cloud-init.spec-adjust-path-for-66-azure-ephemeral.r.patch [bz#2096269]
|
||||||
|
- ci-setup.py-adjust-udev-rules-default-path-1513.patch [bz#2096269]
|
||||||
|
- Resolves: bz#2096269
|
||||||
|
(Adjust udev/rules default path[RHEL-8])
|
||||||
|
|
||||||
|
* Thu Jun 23 2022 Jon Maloy <jmaloy@redhat.com> - 22.1-3
|
||||||
|
- ci-Support-EC2-tags-in-instance-metadata-1309.patch [bz#2082686]
|
||||||
|
- Resolves: bz#2082686
|
||||||
|
([cloud][init] Add support for reading tags from instance metadata)
|
||||||
|
|
||||||
|
* Tue May 31 2022 Jon Maloy <jmaloy@redhat.com> - 22.1-2
|
||||||
|
- ci-Add-native-NetworkManager-support-1224.patch [bz#2059872]
|
||||||
|
- ci-Use-Network-Manager-and-Netplan-as-default-renderers.patch [bz#2059872]
|
||||||
|
- ci-Align-rhel-custom-files-with-upstream-1431.patch [bz#2082071]
|
||||||
|
- ci-Remove-rhel-specific-files.patch [bz#2082071]
|
||||||
|
- Resolves: bz#2059872
|
||||||
|
([RHEL-8]Rebase cloud-init from Fedora so it can configure networking using NM keyfiles)
|
||||||
|
- Resolves: bz#2082071
|
||||||
|
(Align cloud.cfg file and systemd with cloud-init upstream .tmpl files)
|
||||||
|
|
||||||
|
* Mon Apr 25 2022 Amy Chen <xiachen@redhat.com> - 22.1-1
|
||||||
|
- Rebaes to 22.1 [bz#2065544]
|
||||||
|
- Resolves: bz#2065544
|
||||||
|
([RHEL-8.7.0] cloud-init rebase to 22.1)
|
||||||
|
|
||||||
|
* Fri Apr 01 2022 Camilla Conte <cconte@redhat.com> - 21.1-15
|
||||||
|
- ci-Detect-a-Python-version-change-and-clear-the-cache-8.patch [bz#1935826]
|
||||||
|
- ci-Fix-MIME-policy-failure-on-python-version-upgrade-93.patch [bz#1935826]
|
||||||
|
- Resolves: bz#1935826
|
||||||
|
([rhel-8] Cloud-init init stage fails after upgrade from RHEL7 to RHEL8.)
|
||||||
|
|
||||||
|
* Fri Feb 25 2022 Jon Maloy <jmaloy@redhat.com> - 21.1-14
|
||||||
|
- ci-Fix-IPv6-netmask-format-for-sysconfig-1215.patch [bz#2046540]
|
||||||
|
- Resolves: bz#2046540
|
||||||
|
(cloud-init writes route6-$DEVICE config with a HEX netmask. ip route does not like : Error: inet6 prefix is expected rather than "fd00:fd00:fd00::/ffff:ffff:ffff:ffff::".)
|
||||||
|
|
||||||
|
* Tue Jan 25 2022 Jon Maloy <jmaloy@redhat.com> - 21.1-13
|
||||||
|
- ci-Add-flexibility-to-IMDS-api-version-793.patch [bz#2023940]
|
||||||
|
- ci-Azure-helper-Ensure-Azure-http-handler-sleeps-betwee.patch [bz#2023940]
|
||||||
|
- ci-azure-Removing-ability-to-invoke-walinuxagent-799.patch [bz#2023940]
|
||||||
|
- ci-Azure-eject-the-provisioning-iso-before-reporting-re.patch [bz#2023940]
|
||||||
|
- ci-Azure-Retrieve-username-and-hostname-from-IMDS-865.patch [bz#2023940]
|
||||||
|
- ci-Azure-Retry-net-metadata-during-nic-attach-for-non-t.patch [bz#2023940]
|
||||||
|
- ci-Azure-adding-support-for-consuming-userdata-from-IMD.patch [bz#2023940]
|
||||||
|
- Resolves: bz#2023940
|
||||||
|
([RHEL-8] Support for provisioning Azure VM with userdata)
|
||||||
|
|
||||||
|
* Wed Jan 19 2022 Jon Maloy <jmaloy@redhat.com> - 21.1-12
|
||||||
|
- ci-Add-gdisk-and-openssl-as-deps-to-fix-UEFI-Azure-init.patch [bz#2039697]
|
||||||
|
- ci-Datasource-for-VMware-953.patch [bz#2026587]
|
||||||
|
- ci-Change-netifaces-dependency-to-0.10.4-965.patch [bz#2026587]
|
||||||
|
- ci-Update-dscheck_VMware-s-rpctool-check-970.patch [bz#2026587]
|
||||||
|
- ci-Revert-unnecesary-lcase-in-ds-identify-978.patch [bz#2026587]
|
||||||
|
- ci-Add-netifaces-package-as-a-Requires-in-cloud-init.sp.patch [bz#2026587]
|
||||||
|
- Resolves: bz#2039697
|
||||||
|
([RHEL8] [Azure] cloud-init fails to configure the system)
|
||||||
|
- Resolves: bz#2026587
|
||||||
|
([cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo')
|
||||||
|
|
||||||
|
* Wed Dec 08 2021 Jon Maloy <jmaloy@redhat.com> - 21.1-11
|
||||||
|
- ci-cloudinit-net-handle-two-different-routes-for-the-sa.patch [bz#2028028]
|
||||||
|
- Resolves: bz#2028028
|
||||||
|
([RHEL-8] Above 19.2 of cloud-init fails to configure routes when configuring static and default routes to the same destination IP)
|
||||||
|
|
||||||
|
* Mon Dec 06 2021 Jon Maloy <jmaloy@redhat.com> - 21.1-10
|
||||||
|
- ci-fix-error-on-upgrade-caused-by-new-vendordata2-attri.patch [bz#2021538]
|
||||||
|
- Resolves: bz#2021538
|
||||||
|
(cloud-init.service fails to start after package update)
|
||||||
|
|
||||||
|
* Mon Oct 25 2021 Jon Maloy <jmaloy@redhat.com> - 21.1-9
|
||||||
|
- ci-cc_ssh.py-fix-private-key-group-owner-and-permission.patch [bz#2013644]
|
||||||
|
- Resolves: bz#2013644
|
||||||
|
(cloud-init fails to set host key permissions correctly)
|
||||||
|
|
||||||
|
* Thu Sep 23 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-8
|
||||||
|
- ci-ssh_utils.py-ignore-when-sshd_config-options-are-not.patch [bz#1862933]
|
||||||
|
- Resolves: bz#1862933
|
||||||
|
(cloud-init fails with ValueError: need more than 1 value to unpack[rhel-8])
|
||||||
|
|
||||||
|
* Fri Aug 27 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-7
|
||||||
|
- ci-Fix-home-permissions-modified-by-ssh-module-SC-338-9.patch [bz#1995840]
|
||||||
|
- Resolves: bz#1995840
|
||||||
|
([cloudinit] Fix home permissions modified by ssh module)
|
||||||
|
|
||||||
|
* Wed Aug 11 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-6
|
||||||
|
- ci-Stop-copying-ssh-system-keys-and-check-folder-permis.patch [bz#1862967]
|
||||||
|
- Resolves: bz#1862967
|
||||||
|
([cloud-init]Customize ssh AuthorizedKeysFile causes login failure)
|
||||||
|
|
||||||
|
* Fri Aug 06 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-5
|
||||||
|
- ci-Add-dhcp-client-as-a-dependency.patch [bz#1977385]
|
||||||
|
- Resolves: bz#1977385
|
||||||
|
([Azure][RHEL-8] cloud-init must require dhcp-client on Azure)
|
||||||
|
|
||||||
|
* Mon Jul 19 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-4
|
||||||
|
- ci-ssh-util-allow-cloudinit-to-merge-all-ssh-keys-into-.patch [bz#1862967]
|
||||||
|
- Resolves: bz#1862967
|
||||||
|
([cloud-init]Customize ssh AuthorizedKeysFile causes login failure)
|
||||||
|
|
||||||
|
* Mon Jul 12 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-3
|
||||||
|
- ci-write-passwords-only-to-serial-console-lock-down-clo.patch [bz#1945891]
|
||||||
|
- Resolves: bz#1945891
|
||||||
|
(CVE-2021-3429 cloud-init: randomly generated passwords logged in clear-text to world-readable file [rhel-8])
|
||||||
|
|
||||||
* Fri Jun 11 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-2
|
* Fri Jun 11 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-2
|
||||||
- ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch [bz#1957532]
|
- ci-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch [bz#1957532]
|
||||||
- ci-cloud-init.spec.template-update-systemd_postun-param.patch [bz#1952089]
|
- ci-cloud-init.spec.template-update-systemd_postun-param.patch [bz#1952089]
|
||||||
|
@ -229,6 +510,17 @@ fi
|
||||||
- Resolves: bz#1958174
|
- Resolves: bz#1958174
|
||||||
([RHEL-8.5.0] Rebase cloud-init to 21.1)
|
([RHEL-8.5.0] Rebase cloud-init to 21.1)
|
||||||
|
|
||||||
|
* Thu May 13 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-10.el8_4.3
|
||||||
|
- ci-get_interfaces-don-t-exclude-Open-vSwitch-bridge-bon.patch [bz#1957135]
|
||||||
|
- ci-net-exclude-OVS-internal-interfaces-in-get_interface.patch [bz#1957135]
|
||||||
|
- Resolves: bz#1957135
|
||||||
|
(Intermittent failure to start cloud-init due to failure to detect macs [rhel-8.4.0.z])
|
||||||
|
|
||||||
|
* Tue Apr 06 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-10.el8_4.1
|
||||||
|
- ci-Fix-requiring-device-number-on-EC2-derivatives-836.patch [bz#1942699]
|
||||||
|
- Resolves: bz#1942699
|
||||||
|
([Aliyun][RHEL8.4][cloud-init] cloud-init service failed to start with Alibaba instance [rhel-8.4.0.z])
|
||||||
|
|
||||||
* Tue Feb 02 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-10.el8
|
* Tue Feb 02 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-10.el8
|
||||||
- ci-fix-a-typo-in-man-page-cloud-init.1-752.patch [bz#1913127]
|
- ci-fix-a-typo-in-man-page-cloud-init.1-752.patch [bz#1913127]
|
||||||
- Resolves: bz#1913127
|
- Resolves: bz#1913127
|
||||||
|
|
Loading…
Reference in New Issue