Compare commits
16 Commits
imports/c8
...
c8
| Author | SHA1 | Date |
|---|---|---|
 eabdullin
|
fda9db576e | |
|
eabdullin
|
976e92ccc1 | |
CentOS Sources
|
2ceec41e2c | |
|
CentOS Sources
|
c3ed77caa4 | |
|
CentOS Sources
|
8706acdb01 | |
|
CentOS Sources
|
5b0b552e23 | |
|
CentOS Sources
|
cd2b81ea61 | |
|
CentOS Sources
|
947bda3709 | |
|
CentOS Sources
|
cf197691a5 | |
|
CentOS Sources
|
886e568584 | |
|
CentOS Sources
|
abb191fe7b | |
|
CentOS Sources
|
f2b347fb74 | |
|
CentOS Sources
|
5918eb684a | |
|
CentOS Sources
|
f0510e213e | |
|
CentOS Sources
|
b660cf0bf5 | |
|
CentOS Sources
|
f375bcc21d |
|
|
@ -1 +1 @@
|
|||
5f4de38850f9691dc9789bd4db4be512c9717d7b SOURCES/cloud-init-19.4.tar.gz
|
||||
e73116733f5636eb4bc1a5e47e802c3635b9bfa2 SOURCES/23.4.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
SOURCES/cloud-init-19.4.tar.gz
|
||||
SOURCES/23.4.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,533 +0,0 @@
|
|||
From 4114343d0cd2fc3e5566eed27272480e003c89cc Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
Date: Thu, 31 May 2018 16:45:23 +0200
|
||||
Subject: Add initial redhat setup
|
||||
|
||||
Rebase notes (18.5):
|
||||
- added bash_completition file
|
||||
- added cloud-id file
|
||||
|
||||
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
|
||||
---
|
||||
.gitignore | 1 +
|
||||
cloudinit/config/cc_chef.py | 6 +-
|
||||
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 | 438 ++++++++++++++++++++++++++++++++++
|
||||
redhat/gating.yaml | 9 +
|
||||
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 | 73 ++++++
|
||||
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 | 19 ++
|
||||
rhel/systemd/cloud-init-local.service | 31 +++
|
||||
rhel/systemd/cloud-init.service | 25 ++
|
||||
rhel/systemd/cloud-init.target | 7 +
|
||||
setup.py | 70 +-----
|
||||
tools/read-version | 28 +--
|
||||
30 files changed, 1417 insertions(+), 98 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 0ad6b7f..e4408a4 100644
|
||||
--- a/cloudinit/config/cc_chef.py
|
||||
+++ b/cloudinit/config/cc_chef.py
|
||||
@@ -33,7 +33,7 @@ file).
|
||||
|
||||
chef:
|
||||
directories: (defaulting to /etc/chef, /var/log/chef, /var/lib/chef,
|
||||
- /var/cache/chef, /var/backups/chef, /var/run/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
|
||||
@@ -89,7 +89,7 @@ CHEF_DIRS = tuple([
|
||||
'/var/lib/chef',
|
||||
'/var/cache/chef',
|
||||
'/var/backups/chef',
|
||||
- '/var/run/chef',
|
||||
+ '/run/chef',
|
||||
])
|
||||
REQUIRED_CHEF_DIRS = tuple([
|
||||
'/etc/chef',
|
||||
@@ -113,7 +113,7 @@ CHEF_RB_TPL_DEFAULTS = {
|
||||
'json_attribs': CHEF_FB_PATH,
|
||||
'file_cache_path': "/var/cache/chef",
|
||||
'file_backup_path': "/var/backups/chef",
|
||||
- 'pid_file': "/var/run/chef/client.pid",
|
||||
+ 'pid_file': "/run/chef/client.pid",
|
||||
'show_time': True,
|
||||
'encrypted_data_bag_secret': None,
|
||||
}
|
||||
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
|
||||
index ca4ffa8..3a04a58 100644
|
||||
--- a/cloudinit/settings.py
|
||||
+++ b/cloudinit/settings.py
|
||||
@@ -46,13 +46,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 0000000..aa29630
|
||||
--- /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 0000000..0c6d2a3
|
||||
--- /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 0000000..82e8bf6
|
||||
--- /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 0000000..f3dcd4b
|
||||
--- /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 0000000..ae9b7d0
|
||||
--- /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 0000000..739b7e3
|
||||
--- /dev/null
|
||||
+++ b/rhel/systemd/cloud-final.service
|
||||
@@ -0,0 +1,19 @@
|
||||
+[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
|
||||
+
|
||||
+# 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 0000000..8f9f6c9
|
||||
--- /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 0000000..d0023a0
|
||||
--- /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 0000000..083c3b6
|
||||
--- /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 01a67b9..b2ac9bb 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -139,14 +139,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 = {
|
||||
@@ -155,9 +147,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()])
|
||||
@@ -208,47 +197,6 @@ class MyEggInfo(egg_info):
|
||||
return ret
|
||||
|
||||
|
||||
-# TODO: Is there a better way to do this??
|
||||
-class InitsysInstallData(install):
|
||||
- init_system = None
|
||||
- user_options = install.user_options + [
|
||||
- # This will magically show up in member variable 'init_sys'
|
||||
- ('init-system=', None,
|
||||
- ('init system(s) to configure (%s) [default: None]' %
|
||||
- (", ".join(INITSYS_TYPES)))),
|
||||
- ]
|
||||
-
|
||||
- def initialize_options(self):
|
||||
- install.initialize_options(self)
|
||||
- self.init_system = ""
|
||||
-
|
||||
- def finalize_options(self):
|
||||
- install.finalize_options(self)
|
||||
-
|
||||
- if self.init_system and isinstance(self.init_system, str):
|
||||
- self.init_system = self.init_system.split(",")
|
||||
-
|
||||
- if len(self.init_system) == 0:
|
||||
- self.init_system = ['systemd']
|
||||
-
|
||||
- bad = [f for f in self.init_system if f not in INITSYS_TYPES]
|
||||
- if len(bad) != 0:
|
||||
- raise DistutilsArgError(
|
||||
- "Invalid --init-system: %s" % (','.join(bad)))
|
||||
-
|
||||
- for system in self.init_system:
|
||||
- # add data files for anything that starts with '<system>.'
|
||||
- datakeys = [k for k in INITSYS_ROOTS
|
||||
- if k.partition(".")[0] == system]
|
||||
- for k in datakeys:
|
||||
- if not INITSYS_FILES[k]:
|
||||
- continue
|
||||
- self.distribution.data_files.append(
|
||||
- (INITSYS_ROOTS[k], INITSYS_FILES[k]))
|
||||
- # Force that command to reinitalize (with new file list)
|
||||
- self.distribution.reinitialize_command('install_data', True)
|
||||
-
|
||||
-
|
||||
if not in_virtualenv():
|
||||
USR = "/" + USR
|
||||
ETC = "/" + ETC
|
||||
@@ -258,14 +206,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)]),
|
||||
@@ -276,15 +221,8 @@ if os.uname()[0] != 'FreeBSD':
|
||||
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
|
||||
-cmdclass = {
|
||||
- 'install': InitsysInstallData,
|
||||
- 'egg_info': MyEggInfo,
|
||||
-}
|
||||
|
||||
requirements = read_requires()
|
||||
|
||||
@@ -299,8 +237,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 6dca659..d43cc8f 100755
|
||||
--- a/tools/read-version
|
||||
+++ b/tools/read-version
|
||||
@@ -65,32 +65,8 @@ output_json = '--json' in sys.argv
|
||||
src_version = ci_version.version_string()
|
||||
version_long = None
|
||||
|
||||
-if is_gitdir(_tdir) and which("git"):
|
||||
- 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
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,271 +0,0 @@
|
|||
From aa7ae9da7e10a5bcf190f8df3072e3864b2d8fb3 Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
Date: Thu, 31 May 2018 19:37:55 +0200
|
||||
Subject: Do not write NM_CONTROLLED=no in generated interface config files
|
||||
|
||||
X-downstream-only: true
|
||||
Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
|
||||
---
|
||||
cloudinit/net/sysconfig.py | 1 -
|
||||
tests/unittests/test_net.py | 30 ------------------------------
|
||||
2 files changed, 31 deletions(-)
|
||||
|
||||
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
||||
index 310cdf0..8bd7e88 100644
|
||||
--- a/cloudinit/net/sysconfig.py
|
||||
+++ b/cloudinit/net/sysconfig.py
|
||||
@@ -272,7 +272,6 @@ class Renderer(renderer.Renderer):
|
||||
iface_defaults = tuple([
|
||||
('ONBOOT', True),
|
||||
('USERCTL', False),
|
||||
- ('NM_CONTROLLED', False),
|
||||
('BOOTPROTO', 'none'),
|
||||
('STARTMODE', 'auto'),
|
||||
])
|
||||
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
||||
index 01119e0..a931a3e 100644
|
||||
--- a/tests/unittests/test_net.py
|
||||
+++ b/tests/unittests/test_net.py
|
||||
@@ -530,7 +530,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
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -636,7 +635,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
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -772,7 +770,6 @@ IPV6ADDR_SECONDARIES="2001:DB9::10/64 2001:DB10::10/64"
|
||||
IPV6INIT=yes
|
||||
IPV6_DEFAULTGW=2001:DB8::1
|
||||
NETMASK=255.255.252.0
|
||||
-NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -889,7 +886,6 @@ NETWORK_CONFIGS = {
|
||||
BOOTPROTO=none
|
||||
DEVICE=eth1
|
||||
HWADDR=cf:d6:af:48:e8:80
|
||||
- NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -907,7 +903,6 @@ NETWORK_CONFIGS = {
|
||||
IPADDR=192.168.21.3
|
||||
NETMASK=255.255.255.0
|
||||
METRIC=10000
|
||||
- NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -1022,7 +1017,6 @@ NETWORK_CONFIGS = {
|
||||
IPV6ADDR=2001:1::1/64
|
||||
IPV6INIT=yes
|
||||
NETMASK=255.255.255.0
|
||||
- NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -1491,7 +1485,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
|
||||
STARTMODE=auto
|
||||
TYPE=Bond
|
||||
@@ -1500,7 +1493,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
|
||||
STARTMODE=auto
|
||||
@@ -1519,7 +1511,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
|
||||
STARTMODE=auto
|
||||
@@ -1530,7 +1521,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
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -1548,7 +1538,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
|
||||
STARTMODE=auto
|
||||
@@ -1560,7 +1549,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
|
||||
STARTMODE=auto
|
||||
SLAVE=yes
|
||||
@@ -1571,7 +1559,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
|
||||
STARTMODE=auto
|
||||
SLAVE=yes
|
||||
@@ -1582,7 +1569,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
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -1592,7 +1578,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
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -1602,7 +1587,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
|
||||
STARTMODE=manual
|
||||
TYPE=Ethernet
|
||||
@@ -2088,7 +2072,6 @@ iface bond0 inet6 static
|
||||
MTU=9000
|
||||
NETMASK=255.255.255.0
|
||||
NETMASK1=255.255.255.0
|
||||
- NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
TYPE=Bond
|
||||
@@ -2099,7 +2082,6 @@ iface bond0 inet6 static
|
||||
DEVICE=bond0s0
|
||||
HWADDR=aa:bb:cc:dd:e8:00
|
||||
MASTER=bond0
|
||||
- NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
SLAVE=yes
|
||||
STARTMODE=auto
|
||||
@@ -2122,7 +2104,6 @@ iface bond0 inet6 static
|
||||
DEVICE=bond0s1
|
||||
HWADDR=aa:bb:cc:dd:e8:01
|
||||
MASTER=bond0
|
||||
- NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
SLAVE=yes
|
||||
STARTMODE=auto
|
||||
@@ -2161,7 +2142,6 @@ iface bond0 inet6 static
|
||||
BOOTPROTO=none
|
||||
DEVICE=en0
|
||||
HWADDR=aa:bb:cc:dd:e8:00
|
||||
- NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -2180,7 +2160,6 @@ iface bond0 inet6 static
|
||||
MTU=2222
|
||||
NETMASK=255.255.255.0
|
||||
NETMASK1=255.255.255.0
|
||||
- NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
PHYSDEV=en0
|
||||
STARTMODE=auto
|
||||
@@ -2222,7 +2201,6 @@ iface bond0 inet6 static
|
||||
DEVICE=br0
|
||||
IPADDR=192.168.2.2
|
||||
NETMASK=255.255.255.0
|
||||
- NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
PRIO=22
|
||||
STARTMODE=auto
|
||||
@@ -2238,7 +2216,6 @@ iface bond0 inet6 static
|
||||
IPADDR6=2001:1::100/96
|
||||
IPV6ADDR=2001:1::100/96
|
||||
IPV6INIT=yes
|
||||
- NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -2252,7 +2229,6 @@ iface bond0 inet6 static
|
||||
IPADDR6=2001:1::101/96
|
||||
IPV6ADDR=2001:1::101/96
|
||||
IPV6INIT=yes
|
||||
- NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -2327,7 +2303,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
|
||||
STARTMODE=manual
|
||||
TYPE=Ethernet
|
||||
@@ -2338,7 +2313,6 @@ iface bond0 inet6 static
|
||||
DEVICE=eth1
|
||||
HWADDR=52:54:00:12:34:aa
|
||||
MTU=1480
|
||||
- NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -2348,7 +2322,6 @@ iface bond0 inet6 static
|
||||
BOOTPROTO=none
|
||||
DEVICE=eth2
|
||||
HWADDR=52:54:00:12:34:ff
|
||||
- NM_CONTROLLED=no
|
||||
ONBOOT=no
|
||||
STARTMODE=manual
|
||||
TYPE=Ethernet
|
||||
@@ -2766,7 +2739,6 @@ class TestRhelSysConfigRendering(CiTestCase):
|
||||
BOOTPROTO=dhcp
|
||||
DEVICE=eth1000
|
||||
HWADDR=07-1c-c6-75-a4-be
|
||||
-NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -2888,7 +2860,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
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -2961,7 +2932,6 @@ USERCTL=no
|
||||
#
|
||||
BOOTPROTO=dhcp
|
||||
DEVICE=eth0
|
||||
-NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -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,66 +0,0 @@
|
|||
From f15946568fe731dc9bf477f3f06c9c4e0f74f7c1 Mon Sep 17 00:00:00 2001
|
||||
From: Lars Kellogg-Stedman <lars@redhat.com>
|
||||
Date: Fri, 7 Apr 2017 18:50:54 -0400
|
||||
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
|
||||
---
|
||||
cloudinit/settings.py | 1 +
|
||||
cloudinit/stages.py | 3 ++-
|
||||
doc/examples/cloud-config.txt | 4 ++++
|
||||
3 files changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
|
||||
index 3a04a58..439eee0 100644
|
||||
--- a/cloudinit/settings.py
|
||||
+++ b/cloudinit/settings.py
|
||||
@@ -45,6 +45,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 71f3a49..68b83af 100644
|
||||
--- a/cloudinit/stages.py
|
||||
+++ b/cloudinit/stages.py
|
||||
@@ -149,8 +149,9 @@ 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)
|
||||
+ util.ensure_file(log_file, mode=log_file_mode)
|
||||
perms = self.cfg.get('syslog_fix_perms')
|
||||
if not perms:
|
||||
perms = {}
|
||||
diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt
|
||||
index eb84dcf..0e82b83 100644
|
||||
--- a/doc/examples/cloud-config.txt
|
||||
+++ b/doc/examples/cloud-config.txt
|
||||
@@ -413,10 +413,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
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
From 13ee71a3add0dd2e7c60fc672134e696bd7f6a77 Mon Sep 17 00:00:00 2001
|
||||
From fea3e7fc6d23e988cf4a33dc03064ff31bf1d72d Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Wed, 20 Mar 2019 11:45:59 +0100
|
||||
Date: Fri, 7 May 2021 13:36:13 +0200
|
||||
Subject: include 'NOZEROCONF=yes' in /etc/sysconfig/network
|
||||
|
||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
||||
|
|
@ -21,45 +21,33 @@ Resolves: rhbz#1653131
|
|||
|
||||
Signed-off-by: Eduardo Otubo <otubo@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 ++++++++++-
|
||||
tests/unittests/test_net.py | 1 -
|
||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||
cloudinit/net/sysconfig.py | 11 ++++++++++-
|
||||
redhat/scripts/frh.py | 10 +++++++---
|
||||
2 files changed, 17 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
||||
index 8bd7e88..810b283 100644
|
||||
index 3b7a1f93..f01c4236 100644
|
||||
--- a/cloudinit/net/sysconfig.py
|
||||
+++ b/cloudinit/net/sysconfig.py
|
||||
@@ -754,7 +754,16 @@ class Renderer(renderer.Renderer):
|
||||
@@ -1029,7 +1029,16 @@ class Renderer(renderer.Renderer):
|
||||
# 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))
|
||||
- netcfg = [_make_header(), 'NETWORKING=yes']
|
||||
- netcfg = [_make_header(), "NETWORKING=yes"]
|
||||
+ netcfg = []
|
||||
+ for line in util.load_file(sysconfig_path, quiet=True).split('\n'):
|
||||
+ if 'cloud-init' in line:
|
||||
+ for line in util.load_file(sysconfig_path, quiet=True).split("\n"):
|
||||
+ if "cloud-init" in line:
|
||||
+ break
|
||||
+ if not line.startswith(('NETWORKING=',
|
||||
+ 'IPV6_AUTOCONF=',
|
||||
+ 'NETWORKING_IPV6=')):
|
||||
+ if not line.startswith(
|
||||
+ ("NETWORKING=", "IPV6_AUTOCONF=", "NETWORKING_IPV6=")
|
||||
+ ):
|
||||
+ netcfg.append(line)
|
||||
+ # 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:
|
||||
netcfg.append('NETWORKING_IPV6=yes')
|
||||
netcfg.append('IPV6_AUTOCONF=no')
|
||||
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
||||
index 1306a0f..a931a3e 100644
|
||||
--- a/tests/unittests/test_net.py
|
||||
+++ b/tests/unittests/test_net.py
|
||||
@@ -1483,7 +1483,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
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
netcfg.append("NETWORKING_IPV6=yes")
|
||||
netcfg.append("IPV6_AUTOCONF=no")
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
From e2b22710db558df261883eaf5dde866c69ba17dd Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
Date: Thu, 31 May 2018 20:00:32 +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
|
||||
---
|
||||
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 a931a3e..1306a0f 100644
|
||||
--- a/tests/unittests/test_net.py
|
||||
+++ b/tests/unittests/test_net.py
|
||||
@@ -1483,6 +1483,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
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
From 9a09efb49c2d7cade1f0ac309293166c3c2d8d7b Mon Sep 17 00:00:00 2001
|
||||
From: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
Date: Tue, 17 Apr 2018 13:07:54 +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: 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 24f448c..6fb889c 100755
|
||||
--- a/cloudinit/sources/DataSourceAzure.py
|
||||
+++ b/cloudinit/sources/DataSourceAzure.py
|
||||
@@ -256,7 +256,7 @@ def get_hostname(hostname_command='hostname'):
|
||||
|
||||
|
||||
def set_hostname(hostname, hostname_command='hostname'):
|
||||
- util.subp([hostname_command, hostname])
|
||||
+ util.subp(['hostnamectl', 'set-hostname', str(hostname)])
|
||||
|
||||
|
||||
@azure_ds_telemetry_reporter
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -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,56 +0,0 @@
|
|||
From 9d951d55a1be44bbeb5df485d14d4f84ddf01142 Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Mon, 2 Mar 2020 10:46:35 +0100
|
||||
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>
|
||||
---
|
||||
rhel/systemd/cloud-final.service | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/rhel/systemd/cloud-final.service b/rhel/systemd/cloud-final.service
|
||||
index 739b7e3..f303483 100644
|
||||
--- a/rhel/systemd/cloud-final.service
|
||||
+++ b/rhel/systemd/cloud-final.service
|
||||
@@ -11,6 +11,8 @@ ExecStart=/usr/bin/cloud-init modules --mode=final
|
||||
RemainAfterExit=yes
|
||||
TimeoutSec=0
|
||||
KillMode=process
|
||||
+ExecStartPost=/bin/echo "try restart NetworkManager.service"
|
||||
+ExecStartPost=/usr/bin/systemctl try-restart NetworkManager.service
|
||||
|
||||
# Output needs to appear in instance console output
|
||||
StandardOutput=journal+console
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -1,488 +0,0 @@
|
|||
From ec14b8ed9cb4264333b80b4361171b1b529c58f3 Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Tue, 3 Nov 2020 12:11:45 +0100
|
||||
Subject: [PATCH 3/5] Add config modules for controlling IBM PowerVM RMC.
|
||||
(#584)
|
||||
|
||||
RH-Author: Eduardo Terrell Ferrari Otubo (eterrell)
|
||||
RH-MergeRequest: 16: Add config modules for controlling IBM PowerVM RMC. (#584)
|
||||
RH-Commit: [1/1] 734e2c48d323af31aa36abefae346ef62ba3ef5d (eterrell/cloud-init)
|
||||
RH-Bugzilla: 1894014
|
||||
|
||||
commit f99d4f96b00a9cfec1c721d364cbfd728674e5dc
|
||||
Author: Aman306 <45781773+Aman306@users.noreply.github.com>
|
||||
Date: Wed Oct 28 23:36:09 2020 +0530
|
||||
|
||||
Add config modules for controlling IBM PowerVM RMC. (#584)
|
||||
|
||||
Reliable Scalable Cluster Technology (RSCT) is a set of software
|
||||
components that together provide a comprehensive clustering
|
||||
environment(RAS features) for IBM PowerVM based virtual machines. RSCT
|
||||
includes the Resource Monitoring and Control (RMC) subsystem. RMC is a
|
||||
generalized framework used for managing, monitoring, and manipulating
|
||||
resources. RMC runs as a daemon process on individual machines and needs
|
||||
creation of unique node id and restarts during VM boot.
|
||||
|
||||
LP: #1895979
|
||||
|
||||
Co-authored-by: Scott Moser <smoser@brickies.net>
|
||||
|
||||
Conflicts:
|
||||
* Calls to module subp.* are replaced by old calls to util.* since the
|
||||
patch that groups subp.* calls into its own module are introduced after
|
||||
19.4 release - and it's a huge reafctoring not worth the cherry-pick.
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
---
|
||||
cloudinit/config/cc_refresh_rmc_and_interface.py | 158 +++++++++++++++++++++
|
||||
cloudinit/config/cc_reset_rmc.py | 142 ++++++++++++++++++
|
||||
config/cloud.cfg.tmpl | 2 +
|
||||
.../test_handler_refresh_rmc_and_interface.py | 109 ++++++++++++++
|
||||
4 files changed, 411 insertions(+)
|
||||
create mode 100644 cloudinit/config/cc_refresh_rmc_and_interface.py
|
||||
create mode 100644 cloudinit/config/cc_reset_rmc.py
|
||||
create mode 100644 tests/unittests/test_handler/test_handler_refresh_rmc_and_interface.py
|
||||
|
||||
diff --git a/cloudinit/config/cc_refresh_rmc_and_interface.py b/cloudinit/config/cc_refresh_rmc_and_interface.py
|
||||
new file mode 100644
|
||||
index 0000000..07050c4
|
||||
--- /dev/null
|
||||
+++ b/cloudinit/config/cc_refresh_rmc_and_interface.py
|
||||
@@ -0,0 +1,158 @@
|
||||
+# (c) Copyright IBM Corp. 2020 All Rights Reserved
|
||||
+#
|
||||
+# Author: Aman Kumar Sinha <amansi26@in.ibm.com>
|
||||
+#
|
||||
+# This file is part of cloud-init. See LICENSE file for license information.
|
||||
+
|
||||
+"""
|
||||
+Refresh IPv6 interface and RMC
|
||||
+------------------------------
|
||||
+**Summary:** Ensure Network Manager is not managing IPv6 interface
|
||||
+
|
||||
+This module is IBM PowerVM Hypervisor specific
|
||||
+
|
||||
+Reliable Scalable Cluster Technology (RSCT) is a set of software components
|
||||
+that together provide a comprehensive clustering environment(RAS features)
|
||||
+for IBM PowerVM based virtual machines. RSCT includes the Resource
|
||||
+Monitoring and Control (RMC) subsystem. RMC is a generalized framework used
|
||||
+for managing, monitoring, and manipulating resources. RMC runs as a daemon
|
||||
+process on individual machines and needs creation of unique node id and
|
||||
+restarts during VM boot.
|
||||
+More details refer
|
||||
+https://www.ibm.com/support/knowledgecenter/en/SGVKBA_3.2/admin/bl503_ovrv.htm
|
||||
+
|
||||
+This module handles
|
||||
+- Refreshing RMC
|
||||
+- Disabling NetworkManager from handling IPv6 interface, as IPv6 interface
|
||||
+ is used for communication between RMC daemon and PowerVM hypervisor.
|
||||
+
|
||||
+**Internal name:** ``cc_refresh_rmc_and_interface``
|
||||
+
|
||||
+**Module frequency:** per always
|
||||
+
|
||||
+**Supported distros:** RHEL
|
||||
+
|
||||
+"""
|
||||
+
|
||||
+from cloudinit import log as logging
|
||||
+from cloudinit.settings import PER_ALWAYS
|
||||
+from cloudinit import util
|
||||
+from cloudinit import netinfo
|
||||
+
|
||||
+import errno
|
||||
+
|
||||
+frequency = PER_ALWAYS
|
||||
+
|
||||
+LOG = logging.getLogger(__name__)
|
||||
+# Ensure that /opt/rsct/bin has been added to standard PATH of the
|
||||
+# distro. The symlink to rmcctrl is /usr/sbin/rsct/bin/rmcctrl .
|
||||
+RMCCTRL = 'rmcctrl'
|
||||
+
|
||||
+
|
||||
+def handle(name, _cfg, _cloud, _log, _args):
|
||||
+ if not util.which(RMCCTRL):
|
||||
+ LOG.debug("No '%s' in path, disabled", RMCCTRL)
|
||||
+ return
|
||||
+
|
||||
+ LOG.debug(
|
||||
+ 'Making the IPv6 up explicitly. '
|
||||
+ 'Ensuring IPv6 interface is not being handled by NetworkManager '
|
||||
+ 'and it is restarted to re-establish the communication with '
|
||||
+ 'the hypervisor')
|
||||
+
|
||||
+ ifaces = find_ipv6_ifaces()
|
||||
+
|
||||
+ # Setting NM_CONTROLLED=no for IPv6 interface
|
||||
+ # making it down and up
|
||||
+
|
||||
+ if len(ifaces) == 0:
|
||||
+ LOG.debug("Did not find any interfaces with ipv6 addresses.")
|
||||
+ else:
|
||||
+ for iface in ifaces:
|
||||
+ refresh_ipv6(iface)
|
||||
+ disable_ipv6(sysconfig_path(iface))
|
||||
+ restart_network_manager()
|
||||
+
|
||||
+
|
||||
+def find_ipv6_ifaces():
|
||||
+ info = netinfo.netdev_info()
|
||||
+ ifaces = []
|
||||
+ for iface, data in info.items():
|
||||
+ if iface == "lo":
|
||||
+ LOG.debug('Skipping localhost interface')
|
||||
+ if len(data.get("ipv4", [])) != 0:
|
||||
+ # skip this interface, as it has ipv4 addrs
|
||||
+ continue
|
||||
+ ifaces.append(iface)
|
||||
+ return ifaces
|
||||
+
|
||||
+
|
||||
+def refresh_ipv6(interface):
|
||||
+ # IPv6 interface is explicitly brought up, subsequent to which the
|
||||
+ # RMC services are restarted to re-establish the communication with
|
||||
+ # the hypervisor.
|
||||
+ util.subp(['ip', 'link', 'set', interface, 'down'])
|
||||
+ util.subp(['ip', 'link', 'set', interface, 'up'])
|
||||
+
|
||||
+
|
||||
+def sysconfig_path(iface):
|
||||
+ return '/etc/sysconfig/network-scripts/ifcfg-' + iface
|
||||
+
|
||||
+
|
||||
+def restart_network_manager():
|
||||
+ util.subp(['systemctl', 'restart', 'NetworkManager'])
|
||||
+
|
||||
+
|
||||
+def disable_ipv6(iface_file):
|
||||
+ # Ensuring that the communication b/w the hypervisor and VM is not
|
||||
+ # interrupted due to NetworkManager. For this purpose, as part of
|
||||
+ # this function, the NM_CONTROLLED is explicitly set to No for IPV6
|
||||
+ # interface and NetworkManager is restarted.
|
||||
+ try:
|
||||
+ contents = util.load_file(iface_file)
|
||||
+ except IOError as e:
|
||||
+ if e.errno == errno.ENOENT:
|
||||
+ LOG.debug("IPv6 interface file %s does not exist\n",
|
||||
+ iface_file)
|
||||
+ else:
|
||||
+ raise e
|
||||
+
|
||||
+ if 'IPV6INIT' not in contents:
|
||||
+ LOG.debug("Interface file %s did not have IPV6INIT", iface_file)
|
||||
+ return
|
||||
+
|
||||
+ LOG.debug("Editing interface file %s ", iface_file)
|
||||
+
|
||||
+ # Dropping any NM_CONTROLLED or IPV6 lines from IPv6 interface file.
|
||||
+ lines = contents.splitlines()
|
||||
+ lines = [line for line in lines if not search(line)]
|
||||
+ lines.append("NM_CONTROLLED=no")
|
||||
+
|
||||
+ with open(iface_file, "w") as fp:
|
||||
+ fp.write("\n".join(lines) + "\n")
|
||||
+
|
||||
+
|
||||
+def search(contents):
|
||||
+ # Search for any NM_CONTROLLED or IPV6 lines in IPv6 interface file.
|
||||
+ return(
|
||||
+ contents.startswith("IPV6ADDR") or
|
||||
+ contents.startswith("IPADDR6") or
|
||||
+ contents.startswith("IPV6INIT") or
|
||||
+ contents.startswith("NM_CONTROLLED"))
|
||||
+
|
||||
+
|
||||
+def refresh_rmc():
|
||||
+ # To make a healthy connection between RMC daemon and hypervisor we
|
||||
+ # refresh RMC. With refreshing RMC we are ensuring that making IPv6
|
||||
+ # down and up shouldn't impact communication between RMC daemon and
|
||||
+ # hypervisor.
|
||||
+ # -z : stop Resource Monitoring & Control subsystem and all resource
|
||||
+ # managers, but the command does not return control to the user
|
||||
+ # until the subsystem and all resource managers are stopped.
|
||||
+ # -s : start Resource Monitoring & Control subsystem.
|
||||
+ try:
|
||||
+ util.subp([RMCCTRL, '-z'])
|
||||
+ util.subp([RMCCTRL, '-s'])
|
||||
+ except Exception:
|
||||
+ util.logexc(LOG, 'Failed to refresh the RMC subsystem.')
|
||||
+ raise
|
||||
diff --git a/cloudinit/config/cc_reset_rmc.py b/cloudinit/config/cc_reset_rmc.py
|
||||
new file mode 100644
|
||||
index 0000000..68373ad
|
||||
--- /dev/null
|
||||
+++ b/cloudinit/config/cc_reset_rmc.py
|
||||
@@ -0,0 +1,142 @@
|
||||
+# (c) Copyright IBM Corp. 2020 All Rights Reserved
|
||||
+#
|
||||
+# Author: Aman Kumar Sinha <amansi26@in.ibm.com>
|
||||
+#
|
||||
+# This file is part of cloud-init. See LICENSE file for license information.
|
||||
+
|
||||
+
|
||||
+"""
|
||||
+Reset RMC
|
||||
+------------
|
||||
+**Summary:** reset rsct node id
|
||||
+
|
||||
+Reset RMC module is IBM PowerVM Hypervisor specific
|
||||
+
|
||||
+Reliable Scalable Cluster Technology (RSCT) is a set of software components,
|
||||
+that together provide a comprehensive clustering environment (RAS features)
|
||||
+for IBM PowerVM based virtual machines. RSCT includes the Resource monitoring
|
||||
+and control (RMC) subsystem. RMC is a generalized framework used for managing,
|
||||
+monitoring, and manipulating resources. RMC runs as a daemon process on
|
||||
+individual machines and needs creation of unique node id and restarts
|
||||
+during VM boot.
|
||||
+More details refer
|
||||
+https://www.ibm.com/support/knowledgecenter/en/SGVKBA_3.2/admin/bl503_ovrv.htm
|
||||
+
|
||||
+This module handles
|
||||
+- creation of the unique RSCT node id to every instance/virtual machine
|
||||
+ and ensure once set, it isn't changed subsequently by cloud-init.
|
||||
+ In order to do so, it restarts RSCT service.
|
||||
+
|
||||
+Prerequisite of using this module is to install RSCT packages.
|
||||
+
|
||||
+**Internal name:** ``cc_reset_rmc``
|
||||
+
|
||||
+**Module frequency:** per instance
|
||||
+
|
||||
+**Supported distros:** rhel, sles and ubuntu
|
||||
+
|
||||
+"""
|
||||
+import os
|
||||
+
|
||||
+from cloudinit import log as logging
|
||||
+from cloudinit.settings import PER_INSTANCE
|
||||
+from cloudinit import util
|
||||
+
|
||||
+frequency = PER_INSTANCE
|
||||
+
|
||||
+# RMCCTRL is expected to be in system PATH (/opt/rsct/bin)
|
||||
+# The symlink for RMCCTRL and RECFGCT are
|
||||
+# /usr/sbin/rsct/bin/rmcctrl and
|
||||
+# /usr/sbin/rsct/install/bin/recfgct respectively.
|
||||
+RSCT_PATH = '/opt/rsct/install/bin'
|
||||
+RMCCTRL = 'rmcctrl'
|
||||
+RECFGCT = 'recfgct'
|
||||
+
|
||||
+LOG = logging.getLogger(__name__)
|
||||
+
|
||||
+NODE_ID_FILE = '/etc/ct_node_id'
|
||||
+
|
||||
+
|
||||
+def handle(name, _cfg, cloud, _log, _args):
|
||||
+ # Ensuring node id has to be generated only once during first boot
|
||||
+ if cloud.datasource.platform_type == 'none':
|
||||
+ LOG.debug('Skipping creation of new ct_node_id node')
|
||||
+ return
|
||||
+
|
||||
+ if not os.path.isdir(RSCT_PATH):
|
||||
+ LOG.debug("module disabled, RSCT_PATH not present")
|
||||
+ return
|
||||
+
|
||||
+ orig_path = os.environ.get('PATH')
|
||||
+ try:
|
||||
+ add_path(orig_path)
|
||||
+ reset_rmc()
|
||||
+ finally:
|
||||
+ if orig_path:
|
||||
+ os.environ['PATH'] = orig_path
|
||||
+ else:
|
||||
+ del os.environ['PATH']
|
||||
+
|
||||
+
|
||||
+def reconfigure_rsct_subsystems():
|
||||
+ # Reconfigure the RSCT subsystems, which includes removing all RSCT data
|
||||
+ # under the /var/ct directory, generating a new node ID, and making it
|
||||
+ # appear as if the RSCT components were just installed
|
||||
+ try:
|
||||
+ out = util.subp([RECFGCT])[0]
|
||||
+ LOG.debug(out.strip())
|
||||
+ return out
|
||||
+ except util.ProcessExecutionError:
|
||||
+ util.logexc(LOG, 'Failed to reconfigure the RSCT subsystems.')
|
||||
+ raise
|
||||
+
|
||||
+
|
||||
+def get_node_id():
|
||||
+ try:
|
||||
+ fp = util.load_file(NODE_ID_FILE)
|
||||
+ node_id = fp.split('\n')[0]
|
||||
+ return node_id
|
||||
+ except Exception:
|
||||
+ util.logexc(LOG, 'Failed to get node ID from file %s.' % NODE_ID_FILE)
|
||||
+ raise
|
||||
+
|
||||
+
|
||||
+def add_path(orig_path):
|
||||
+ # Adding the RSCT_PATH to env standard path
|
||||
+ # So thet cloud init automatically find and
|
||||
+ # run RECFGCT to create new node_id.
|
||||
+ suff = ":" + orig_path if orig_path else ""
|
||||
+ os.environ['PATH'] = RSCT_PATH + suff
|
||||
+ return os.environ['PATH']
|
||||
+
|
||||
+
|
||||
+def rmcctrl():
|
||||
+ # Stop the RMC subsystem and all resource managers so that we can make
|
||||
+ # some changes to it
|
||||
+ try:
|
||||
+ return util.subp([RMCCTRL, '-z'])
|
||||
+ except Exception:
|
||||
+ util.logexc(LOG, 'Failed to stop the RMC subsystem.')
|
||||
+ raise
|
||||
+
|
||||
+
|
||||
+def reset_rmc():
|
||||
+ LOG.debug('Attempting to reset RMC.')
|
||||
+
|
||||
+ node_id_before = get_node_id()
|
||||
+ LOG.debug('Node ID at beginning of module: %s', node_id_before)
|
||||
+
|
||||
+ # Stop the RMC subsystem and all resource managers so that we can make
|
||||
+ # some changes to it
|
||||
+ rmcctrl()
|
||||
+ reconfigure_rsct_subsystems()
|
||||
+
|
||||
+ node_id_after = get_node_id()
|
||||
+ LOG.debug('Node ID at end of module: %s', node_id_after)
|
||||
+
|
||||
+ # Check if new node ID is generated or not
|
||||
+ # by comparing old and new node ID
|
||||
+ if node_id_after == node_id_before:
|
||||
+ msg = 'New node ID did not get generated.'
|
||||
+ LOG.error(msg)
|
||||
+ raise Exception(msg)
|
||||
diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
|
||||
index 87c37ba..52a259c 100644
|
||||
--- a/config/cloud.cfg.tmpl
|
||||
+++ b/config/cloud.cfg.tmpl
|
||||
@@ -121,6 +121,8 @@ cloud_final_modules:
|
||||
- mcollective
|
||||
{% endif %}
|
||||
- salt-minion
|
||||
+ - reset_rmc
|
||||
+ - refresh_rmc_and_interface
|
||||
- rightscale_userdata
|
||||
- scripts-vendor
|
||||
- scripts-per-once
|
||||
diff --git a/tests/unittests/test_handler/test_handler_refresh_rmc_and_interface.py b/tests/unittests/test_handler/test_handler_refresh_rmc_and_interface.py
|
||||
new file mode 100644
|
||||
index 0000000..0c35710
|
||||
--- /dev/null
|
||||
+++ b/tests/unittests/test_handler/test_handler_refresh_rmc_and_interface.py
|
||||
@@ -0,0 +1,109 @@
|
||||
+from cloudinit.config import cc_refresh_rmc_and_interface as ccrmci
|
||||
+
|
||||
+from cloudinit import util
|
||||
+
|
||||
+from cloudinit.tests import helpers as t_help
|
||||
+from cloudinit.tests.helpers import mock
|
||||
+
|
||||
+from textwrap import dedent
|
||||
+import logging
|
||||
+
|
||||
+LOG = logging.getLogger(__name__)
|
||||
+MPATH = "cloudinit.config.cc_refresh_rmc_and_interface"
|
||||
+NET_INFO = {
|
||||
+ 'lo': {'ipv4': [{'ip': '127.0.0.1',
|
||||
+ 'bcast': '', 'mask': '255.0.0.0',
|
||||
+ 'scope': 'host'}],
|
||||
+ 'ipv6': [{'ip': '::1/128',
|
||||
+ 'scope6': 'host'}], 'hwaddr': '',
|
||||
+ 'up': 'True'},
|
||||
+ 'env2': {'ipv4': [{'ip': '8.0.0.19',
|
||||
+ 'bcast': '8.0.0.255', 'mask': '255.255.255.0',
|
||||
+ 'scope': 'global'}],
|
||||
+ 'ipv6': [{'ip': 'fe80::f896:c2ff:fe81:8220/64',
|
||||
+ 'scope6': 'link'}], 'hwaddr': 'fa:96:c2:81:82:20',
|
||||
+ 'up': 'True'},
|
||||
+ 'env3': {'ipv4': [{'ip': '90.0.0.14',
|
||||
+ 'bcast': '90.0.0.255', 'mask': '255.255.255.0',
|
||||
+ 'scope': 'global'}],
|
||||
+ 'ipv6': [{'ip': 'fe80::f896:c2ff:fe81:8221/64',
|
||||
+ 'scope6': 'link'}], 'hwaddr': 'fa:96:c2:81:82:21',
|
||||
+ 'up': 'True'},
|
||||
+ 'env4': {'ipv4': [{'ip': '9.114.23.7',
|
||||
+ 'bcast': '9.114.23.255', 'mask': '255.255.255.0',
|
||||
+ 'scope': 'global'}],
|
||||
+ 'ipv6': [{'ip': 'fe80::f896:c2ff:fe81:8222/64',
|
||||
+ 'scope6': 'link'}], 'hwaddr': 'fa:96:c2:81:82:22',
|
||||
+ 'up': 'True'},
|
||||
+ 'env5': {'ipv4': [],
|
||||
+ 'ipv6': [{'ip': 'fe80::9c26:c3ff:fea4:62c8/64',
|
||||
+ 'scope6': 'link'}], 'hwaddr': '42:20:86:df:fa:4c',
|
||||
+ 'up': 'True'}}
|
||||
+
|
||||
+
|
||||
+class TestRsctNodeFile(t_help.CiTestCase):
|
||||
+ def test_disable_ipv6_interface(self):
|
||||
+ """test parsing of iface files."""
|
||||
+ fname = self.tmp_path("iface-eth5")
|
||||
+ util.write_file(fname, dedent("""\
|
||||
+ BOOTPROTO=static
|
||||
+ DEVICE=eth5
|
||||
+ HWADDR=42:20:86:df:fa:4c
|
||||
+ IPV6INIT=yes
|
||||
+ IPADDR6=fe80::9c26:c3ff:fea4:62c8/64
|
||||
+ IPV6ADDR=fe80::9c26:c3ff:fea4:62c8/64
|
||||
+ NM_CONTROLLED=yes
|
||||
+ ONBOOT=yes
|
||||
+ STARTMODE=auto
|
||||
+ TYPE=Ethernet
|
||||
+ USERCTL=no
|
||||
+ """))
|
||||
+
|
||||
+ ccrmci.disable_ipv6(fname)
|
||||
+ self.assertEqual(dedent("""\
|
||||
+ BOOTPROTO=static
|
||||
+ DEVICE=eth5
|
||||
+ HWADDR=42:20:86:df:fa:4c
|
||||
+ ONBOOT=yes
|
||||
+ STARTMODE=auto
|
||||
+ TYPE=Ethernet
|
||||
+ USERCTL=no
|
||||
+ NM_CONTROLLED=no
|
||||
+ """), util.load_file(fname))
|
||||
+
|
||||
+ @mock.patch(MPATH + '.refresh_rmc')
|
||||
+ @mock.patch(MPATH + '.restart_network_manager')
|
||||
+ @mock.patch(MPATH + '.disable_ipv6')
|
||||
+ @mock.patch(MPATH + '.refresh_ipv6')
|
||||
+ @mock.patch(MPATH + '.netinfo.netdev_info')
|
||||
+ @mock.patch(MPATH + '.util.which')
|
||||
+ def test_handle(self, m_refresh_rmc,
|
||||
+ m_netdev_info, m_refresh_ipv6, m_disable_ipv6,
|
||||
+ m_restart_nm, m_which):
|
||||
+ """Basic test of handle."""
|
||||
+ m_netdev_info.return_value = NET_INFO
|
||||
+ m_which.return_value = '/opt/rsct/bin/rmcctrl'
|
||||
+ ccrmci.handle(
|
||||
+ "refresh_rmc_and_interface", None, None, None, None)
|
||||
+ self.assertEqual(1, m_netdev_info.call_count)
|
||||
+ m_refresh_ipv6.assert_called_with('env5')
|
||||
+ m_disable_ipv6.assert_called_with(
|
||||
+ '/etc/sysconfig/network-scripts/ifcfg-env5')
|
||||
+ self.assertEqual(1, m_restart_nm.call_count)
|
||||
+ self.assertEqual(1, m_refresh_rmc.call_count)
|
||||
+
|
||||
+ @mock.patch(MPATH + '.netinfo.netdev_info')
|
||||
+ def test_find_ipv6(self, m_netdev_info):
|
||||
+ """find_ipv6_ifaces parses netdev_info returning those with ipv6"""
|
||||
+ m_netdev_info.return_value = NET_INFO
|
||||
+ found = ccrmci.find_ipv6_ifaces()
|
||||
+ self.assertEqual(['env5'], found)
|
||||
+
|
||||
+ @mock.patch(MPATH + '.util.subp')
|
||||
+ def test_refresh_ipv6(self, m_subp):
|
||||
+ """refresh_ipv6 should ip down and up the interface."""
|
||||
+ iface = "myeth0"
|
||||
+ ccrmci.refresh_ipv6(iface)
|
||||
+ m_subp.assert_has_calls([
|
||||
+ mock.call(['ip', 'link', 'set', iface, 'down']),
|
||||
+ mock.call(['ip', 'link', 'set', iface, 'up'])])
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
From 65b26a20b550ae301ca33eafe062a873f53969de Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Wed, 24 Jun 2020 07:34:32 +0200
|
||||
Subject: [PATCH 3/4] Change from redhat to rhel in systemd generator tmpl
|
||||
(#450)
|
||||
|
||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Message-id: <20200623154034.28563-3-otubo@redhat.com>
|
||||
Patchwork-id: 97783
|
||||
O-Subject: [RHEL-8.3.0/RHEL-8.2.1 cloud-init PATCH 2/3] Change from redhat to rhel in systemd generator tmpl (#450)
|
||||
Bugzilla: 1834173
|
||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
|
||||
commit 650d53d656b612442773453813d8417b234d3752
|
||||
Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Tue Jun 23 14:41:15 2020 +0200
|
||||
|
||||
Change from redhat to rhel in systemd generator tmpl (#450)
|
||||
|
||||
The name `redhat' is not used but rather `rhel' to identify the distro.
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
systemd/cloud-init-generator.tmpl | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/systemd/cloud-init-generator.tmpl b/systemd/cloud-init-generator.tmpl
|
||||
index 45efa24..0773356 100755
|
||||
--- a/systemd/cloud-init-generator.tmpl
|
||||
+++ b/systemd/cloud-init-generator.tmpl
|
||||
@@ -83,7 +83,7 @@ default() {
|
||||
|
||||
check_for_datasource() {
|
||||
local ds_rc=""
|
||||
-{% if variant in ["redhat", "fedora", "centos"] %}
|
||||
+{% if variant in ["rhel", "fedora", "centos"] %}
|
||||
local dsidentify="/usr/libexec/cloud-init/ds-identify"
|
||||
{% else %}
|
||||
local dsidentify="/usr/lib/cloud-init/ds-identify"
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
From d210f4b6c23d2739f76f9ab348090bcf350c5177 Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Mon, 31 Aug 2020 09:44:05 +0200
|
||||
Subject: [PATCH] Changing notation of subp call
|
||||
|
||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Message-id: <20200824142252.16298-1-otubo@redhat.com>
|
||||
Patchwork-id: 98215
|
||||
O-Subject: [RHEL-7.9.z/RHEL-8.2.1/RHEL-8.3.0 cloud-init PATCH] Changing notation of subp call
|
||||
Bugzilla: 1839662
|
||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
|
||||
The previous patch was applied upstream on top of a refactoring that moves subp
|
||||
to its own module (3c551f6e, Move subp into its own module. (#416), release
|
||||
20.2).
|
||||
|
||||
Downstream we're not there yet, in order to avoid applying the above
|
||||
commit and add a huge refactoring, I'll just change this call and we can
|
||||
benefit of this changes in a future rebase.
|
||||
|
||||
x-downstream-only: yes
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
cloudinit/sources/helpers/vmware/imc/guestcust_util.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cloudinit/sources/helpers/vmware/imc/guestcust_util.py b/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
|
||||
index a270d9f..816f52e 100644
|
||||
--- a/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
|
||||
+++ b/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
|
||||
@@ -136,8 +136,8 @@ def get_tools_config(section, key, defaultVal):
|
||||
cmd = ['vmware-toolbox-cmd', 'config', 'get', section, key]
|
||||
|
||||
try:
|
||||
- (outText, _) = subp.subp(cmd)
|
||||
- except subp.ProcessExecutionError as e:
|
||||
+ (outText, _) = util.subp(cmd)
|
||||
+ except util.ProcessExecutionError as e:
|
||||
if e.exit_code == 69:
|
||||
logger.debug(
|
||||
"vmware-toolbox-cmd returned 69 (unavailable) for cmd: %s."
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,115 +0,0 @@
|
|||
From 94753da021d0849f4858e2c2cb98b3276842b665 Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Mon, 24 Aug 2020 15:34:24 +0200
|
||||
Subject: [PATCH 1/5] DHCP sandboxing failing on noexec mounted /var/tmp (#521)
|
||||
|
||||
RH-Author: Eduardo Terrell Ferrari Otubo (eterrell)
|
||||
RH-MergeRequest: 1: DHCP sandboxing failing on noexec mounted /var/tmp (#521)
|
||||
RH-Commit: [1/1] 4971d742aa1de27dff61b07ef9d6d478c0889ded (eterrell/cloud-init)
|
||||
RH-Bugzilla: 1879989
|
||||
|
||||
commit db86753f81af73826158c9522f2521f210300e2b
|
||||
Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Mon Aug 24 15:34:24 2020 +0200
|
||||
|
||||
DHCP sandboxing failing on noexec mounted /var/tmp (#521)
|
||||
|
||||
* DHCP sandboxing failing on noexec mounted /var/tmp
|
||||
|
||||
If /var/tmp is mounted with noexec option the DHCP sandboxing will fail
|
||||
with Permission Denied. This patch simply avoids this error by checking
|
||||
the exec permission updating the dhcp path in negative case.
|
||||
|
||||
rhbz: https://bugzilla.redhat.com/show_bug.cgi?id=1879989
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
|
||||
* Replacing with os.* calls
|
||||
|
||||
* Adding test and removing isfile() useless call.
|
||||
|
||||
Co-authored-by: Rick Harding <rharding@mitechie.com>
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
---
|
||||
cloudinit/net/dhcp.py | 6 ++++++
|
||||
cloudinit/net/tests/test_dhcp.py | 46 ++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 52 insertions(+)
|
||||
|
||||
diff --git a/cloudinit/net/dhcp.py b/cloudinit/net/dhcp.py
|
||||
index c033cc8..841e72e 100644
|
||||
--- a/cloudinit/net/dhcp.py
|
||||
+++ b/cloudinit/net/dhcp.py
|
||||
@@ -215,6 +215,12 @@ def dhcp_discovery(dhclient_cmd_path, interface, cleandir):
|
||||
pid_file = os.path.join(cleandir, 'dhclient.pid')
|
||||
lease_file = os.path.join(cleandir, 'dhcp.leases')
|
||||
|
||||
+ # In some cases files in /var/tmp may not be executable, launching dhclient
|
||||
+ # from there will certainly raise 'Permission denied' error. Try launching
|
||||
+ # the original dhclient instead.
|
||||
+ if not os.access(sandbox_dhclient_cmd, os.X_OK):
|
||||
+ sandbox_dhclient_cmd = dhclient_cmd_path
|
||||
+
|
||||
# ISC dhclient needs the interface up to send initial discovery packets.
|
||||
# Generally dhclient relies on dhclient-script PREINIT action to bring the
|
||||
# link up before attempting discovery. Since we are using -sf /bin/true,
|
||||
diff --git a/cloudinit/net/tests/test_dhcp.py b/cloudinit/net/tests/test_dhcp.py
|
||||
index c3fa1e0..08e2cfb 100644
|
||||
--- a/cloudinit/net/tests/test_dhcp.py
|
||||
+++ b/cloudinit/net/tests/test_dhcp.py
|
||||
@@ -406,6 +406,52 @@ class TestDHCPDiscoveryClean(CiTestCase):
|
||||
'eth9', '-sf', '/bin/true'], capture=True)])
|
||||
m_kill.assert_has_calls([mock.call(my_pid, signal.SIGKILL)])
|
||||
|
||||
+ @mock.patch('cloudinit.net.dhcp.util.get_proc_ppid')
|
||||
+ @mock.patch('cloudinit.net.dhcp.os.kill')
|
||||
+ @mock.patch('cloudinit.net.dhcp.subp.subp')
|
||||
+ def test_dhcp_discovery_outside_sandbox(self, m_subp, m_kill, m_getppid):
|
||||
+ """dhcp_discovery brings up the interface and runs dhclient.
|
||||
+
|
||||
+ It also returns the parsed dhcp.leases file generated in the sandbox.
|
||||
+ """
|
||||
+ m_subp.return_value = ('', '')
|
||||
+ tmpdir = self.tmp_dir()
|
||||
+ dhclient_script = os.path.join(tmpdir, 'dhclient.orig')
|
||||
+ script_content = '#!/bin/bash\necho fake-dhclient'
|
||||
+ write_file(dhclient_script, script_content, mode=0o755)
|
||||
+ lease_content = dedent("""
|
||||
+ lease {
|
||||
+ interface "eth9";
|
||||
+ fixed-address 192.168.2.74;
|
||||
+ option subnet-mask 255.255.255.0;
|
||||
+ option routers 192.168.2.1;
|
||||
+ }
|
||||
+ """)
|
||||
+ lease_file = os.path.join(tmpdir, 'dhcp.leases')
|
||||
+ write_file(lease_file, lease_content)
|
||||
+ pid_file = os.path.join(tmpdir, 'dhclient.pid')
|
||||
+ my_pid = 1
|
||||
+ write_file(pid_file, "%d\n" % my_pid)
|
||||
+ m_getppid.return_value = 1 # Indicate that dhclient has daemonized
|
||||
+
|
||||
+ with mock.patch('os.access', return_value=False):
|
||||
+ self.assertCountEqual(
|
||||
+ [{'interface': 'eth9', 'fixed-address': '192.168.2.74',
|
||||
+ 'subnet-mask': '255.255.255.0', 'routers': '192.168.2.1'}],
|
||||
+ dhcp_discovery(dhclient_script, 'eth9', tmpdir))
|
||||
+ # dhclient script got copied
|
||||
+ with open(os.path.join(tmpdir, 'dhclient.orig')) as stream:
|
||||
+ self.assertEqual(script_content, stream.read())
|
||||
+ # Interface was brought up before dhclient called from sandbox
|
||||
+ m_subp.assert_has_calls([
|
||||
+ mock.call(
|
||||
+ ['ip', 'link', 'set', 'dev', 'eth9', 'up'], capture=True),
|
||||
+ mock.call(
|
||||
+ [os.path.join(tmpdir, 'dhclient.orig'), '-1', '-v', '-lf',
|
||||
+ lease_file, '-pf', os.path.join(tmpdir, 'dhclient.pid'),
|
||||
+ 'eth9', '-sf', '/bin/true'], capture=True)])
|
||||
+ m_kill.assert_has_calls([mock.call(my_pid, signal.SIGKILL)])
|
||||
+
|
||||
|
||||
class TestSystemdParseLeases(CiTestCase):
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
From 5691fd1ce3eb430c8da19538b5988eba7da6d2be Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Thu, 21 Jan 2021 09:57:53 +0100
|
||||
Subject: [PATCH] DataSourceAzure: update password for defuser if exists (#671)
|
||||
|
||||
RH-Author: Eduardo Terrell Ferrari Otubo (eterrell)
|
||||
RH-MergeRequest: 36: DataSourceAzure: update password for defuser if exists (#671)
|
||||
RH-Commit: [1/1] a834a44ca127480512137b4258ff01e993fbee41 (eterrell/cloud-init)
|
||||
RH-Bugzilla: 1916839
|
||||
|
||||
commit eea754492f074e00b601cf77aa278e3623857c5a
|
||||
Author: Anh Vo <anhvo@microsoft.com>
|
||||
Date: Thu Nov 19 00:35:46 2020 -0500
|
||||
|
||||
DataSourceAzure: update password for defuser if exists (#671)
|
||||
|
||||
cc_set_password will only update the password for the default user if
|
||||
cfg['password'] is set. The existing code of datasource Azure will fail
|
||||
to update the default user's password because it does not set that
|
||||
metadata. If the default user doesn't exist in the image, the current
|
||||
code works fine because the password is set during user create and
|
||||
not in cc_set_password
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
---
|
||||
cloudinit/sources/DataSourceAzure.py | 2 +-
|
||||
tests/unittests/test_datasource/test_azure.py | 3 +++
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
|
||||
index 6fb889c4..69454c40 100755
|
||||
--- a/cloudinit/sources/DataSourceAzure.py
|
||||
+++ b/cloudinit/sources/DataSourceAzure.py
|
||||
@@ -1206,7 +1206,7 @@ def read_azure_ovf(contents):
|
||||
if password:
|
||||
defuser['lock_passwd'] = False
|
||||
if DEF_PASSWD_REDACTION != password:
|
||||
- defuser['passwd'] = encrypt_pass(password)
|
||||
+ defuser['passwd'] = cfg['password'] = encrypt_pass(password)
|
||||
|
||||
if defuser:
|
||||
cfg['system_info'] = {'default_user': defuser}
|
||||
diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py
|
||||
index a809fd87..f141dc6c 100644
|
||||
--- a/tests/unittests/test_datasource/test_azure.py
|
||||
+++ b/tests/unittests/test_datasource/test_azure.py
|
||||
@@ -899,6 +899,9 @@ scbus-1 on xpt0 bus 0
|
||||
crypt.crypt(odata['UserPassword'],
|
||||
defuser['passwd'][0:pos]))
|
||||
|
||||
+ # the same hashed value should also be present in cfg['password']
|
||||
+ self.assertEqual(defuser['passwd'], dsrc.cfg['password'])
|
||||
+
|
||||
def test_user_not_locked_if_password_redacted(self):
|
||||
odata = {'HostName': "myhost", 'UserName': "myuser",
|
||||
'UserPassword': dsaz.DEF_PASSWD_REDACTION}
|
||||
--
|
||||
2.18.4
|
||||
|
||||
|
|
@ -1,230 +0,0 @@
|
|||
From 17f972b6fb172fe19d6e115a20664eefdbd3838d Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Mon, 24 Aug 2020 15:25:38 +0200
|
||||
Subject: [PATCH 3/3] Detect kernel version before swap file creation (#428)
|
||||
|
||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Message-id: <20200820092042.5418-4-otubo@redhat.com>
|
||||
Patchwork-id: 98191
|
||||
O-Subject: [RHEL-8.3.0 cloud-init PATCH 3/3] Detect kernel version before swap file creation (#428)
|
||||
Bugzilla: 1794664
|
||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
|
||||
commit b749548a9eb43b34cce64f8688107645411abc8c
|
||||
Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Tue Aug 18 23:12:02 2020 +0200
|
||||
|
||||
Detect kernel version before swap file creation (#428)
|
||||
|
||||
According to man page `man 8 swapon', "Preallocated swap files are
|
||||
supported on XFS since Linux 4.18". This patch checks for kernel version
|
||||
before attepting to create swapfile, using dd for XFS only on kernel
|
||||
versions <= 4.18 or btrfs.
|
||||
|
||||
Add new func util.kernel_version which returns a tuple of ints (major, minor)
|
||||
|
||||
Signed-off-by: Eduardo Otubo otubo@redhat.com
|
||||
|
||||
Signed-off-by: Eduardo Otubo otubo@redhat.com
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
cloudinit/config/cc_mounts.py | 8 +-
|
||||
cloudinit/util.py | 4 +
|
||||
.../unittests/test_handler/test_handler_mounts.py | 107 +++++++++++++++++++++
|
||||
tests/unittests/test_util.py | 15 +++
|
||||
4 files changed, 131 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py
|
||||
index 0573026..e1c43e3 100644
|
||||
--- a/cloudinit/config/cc_mounts.py
|
||||
+++ b/cloudinit/config/cc_mounts.py
|
||||
@@ -65,7 +65,7 @@ swap file is created.
|
||||
from string import whitespace
|
||||
|
||||
import logging
|
||||
-import os.path
|
||||
+import os
|
||||
import re
|
||||
|
||||
from cloudinit import type_utils
|
||||
@@ -249,7 +249,8 @@ def create_swapfile(fname, size):
|
||||
|
||||
fstype = util.get_mount_info(swap_dir)[1]
|
||||
|
||||
- if fstype in ("xfs", "btrfs"):
|
||||
+ if (fstype == "xfs" and
|
||||
+ util.kernel_version() < (4, 18)) or fstype == "btrfs":
|
||||
create_swap(fname, size, "dd")
|
||||
else:
|
||||
try:
|
||||
@@ -259,7 +260,8 @@ def create_swapfile(fname, size):
|
||||
LOG.warning("Will attempt with dd.")
|
||||
create_swap(fname, size, "dd")
|
||||
|
||||
- util.chmod(fname, 0o600)
|
||||
+ if os.path.exists(fname):
|
||||
+ util.chmod(fname, 0o600)
|
||||
try:
|
||||
util.subp(['mkswap', fname])
|
||||
except util.ProcessExecutionError:
|
||||
diff --git a/cloudinit/util.py b/cloudinit/util.py
|
||||
index 5d51ba8..ad89376 100644
|
||||
--- a/cloudinit/util.py
|
||||
+++ b/cloudinit/util.py
|
||||
@@ -79,6 +79,10 @@ CONTAINER_TESTS = (['systemd-detect-virt', '--quiet', '--container'],
|
||||
['lxc-is-container'])
|
||||
|
||||
|
||||
+def kernel_version():
|
||||
+ return tuple(map(int, os.uname().release.split('.')[:2]))
|
||||
+
|
||||
+
|
||||
@lru_cache()
|
||||
def get_architecture(target=None):
|
||||
out, _ = subp(['dpkg', '--print-architecture'], capture=True,
|
||||
diff --git a/tests/unittests/test_handler/test_handler_mounts.py b/tests/unittests/test_handler/test_handler_mounts.py
|
||||
index 7bcefa0..27bcc6f 100644
|
||||
--- a/tests/unittests/test_handler/test_handler_mounts.py
|
||||
+++ b/tests/unittests/test_handler/test_handler_mounts.py
|
||||
@@ -132,6 +132,113 @@ class TestSanitizeDevname(test_helpers.FilesystemMockingTestCase):
|
||||
'ephemeral0.1', lambda x: disk_path, mock.Mock()))
|
||||
|
||||
|
||||
+class TestSwapFileCreation(test_helpers.FilesystemMockingTestCase):
|
||||
+
|
||||
+ def setUp(self):
|
||||
+ super(TestSwapFileCreation, self).setUp()
|
||||
+ self.new_root = self.tmp_dir()
|
||||
+ self.patchOS(self.new_root)
|
||||
+
|
||||
+ self.fstab_path = os.path.join(self.new_root, 'etc/fstab')
|
||||
+ self.swap_path = os.path.join(self.new_root, 'swap.img')
|
||||
+ self._makedirs('/etc')
|
||||
+
|
||||
+ self.add_patch('cloudinit.config.cc_mounts.FSTAB_PATH',
|
||||
+ 'mock_fstab_path',
|
||||
+ self.fstab_path,
|
||||
+ autospec=False)
|
||||
+
|
||||
+ self.add_patch('cloudinit.config.cc_mounts.subp.subp',
|
||||
+ 'm_subp_subp')
|
||||
+
|
||||
+ self.add_patch('cloudinit.config.cc_mounts.util.mounts',
|
||||
+ 'mock_util_mounts',
|
||||
+ return_value={
|
||||
+ '/dev/sda1': {'fstype': 'ext4',
|
||||
+ 'mountpoint': '/',
|
||||
+ 'opts': 'rw,relatime,discard'
|
||||
+ }})
|
||||
+
|
||||
+ self.mock_cloud = mock.Mock()
|
||||
+ self.mock_log = mock.Mock()
|
||||
+ self.mock_cloud.device_name_to_device = self.device_name_to_device
|
||||
+
|
||||
+ self.cc = {
|
||||
+ 'swap': {
|
||||
+ 'filename': self.swap_path,
|
||||
+ 'size': '512',
|
||||
+ 'maxsize': '512'}}
|
||||
+
|
||||
+ def _makedirs(self, directory):
|
||||
+ directory = os.path.join(self.new_root, directory.lstrip('/'))
|
||||
+ if not os.path.exists(directory):
|
||||
+ os.makedirs(directory)
|
||||
+
|
||||
+ def device_name_to_device(self, path):
|
||||
+ if path == 'swap':
|
||||
+ return self.swap_path
|
||||
+ else:
|
||||
+ dev = None
|
||||
+
|
||||
+ return dev
|
||||
+
|
||||
+ @mock.patch('cloudinit.util.get_mount_info')
|
||||
+ @mock.patch('cloudinit.util.kernel_version')
|
||||
+ def test_swap_creation_method_fallocate_on_xfs(self, m_kernel_version,
|
||||
+ m_get_mount_info):
|
||||
+ m_kernel_version.return_value = (4, 20)
|
||||
+ m_get_mount_info.return_value = ["", "xfs"]
|
||||
+
|
||||
+ cc_mounts.handle(None, self.cc, self.mock_cloud, self.mock_log, [])
|
||||
+ self.m_subp_subp.assert_has_calls([
|
||||
+ mock.call(['fallocate', '-l', '0M', self.swap_path], capture=True),
|
||||
+ mock.call(['mkswap', self.swap_path]),
|
||||
+ mock.call(['swapon', '-a'])])
|
||||
+
|
||||
+ @mock.patch('cloudinit.util.get_mount_info')
|
||||
+ @mock.patch('cloudinit.util.kernel_version')
|
||||
+ def test_swap_creation_method_xfs(self, m_kernel_version,
|
||||
+ m_get_mount_info):
|
||||
+ m_kernel_version.return_value = (3, 18)
|
||||
+ m_get_mount_info.return_value = ["", "xfs"]
|
||||
+
|
||||
+ cc_mounts.handle(None, self.cc, self.mock_cloud, self.mock_log, [])
|
||||
+ self.m_subp_subp.assert_has_calls([
|
||||
+ mock.call(['dd', 'if=/dev/zero',
|
||||
+ 'of=' + self.swap_path,
|
||||
+ 'bs=1M', 'count=0'], capture=True),
|
||||
+ mock.call(['mkswap', self.swap_path]),
|
||||
+ mock.call(['swapon', '-a'])])
|
||||
+
|
||||
+ @mock.patch('cloudinit.util.get_mount_info')
|
||||
+ @mock.patch('cloudinit.util.kernel_version')
|
||||
+ def test_swap_creation_method_btrfs(self, m_kernel_version,
|
||||
+ m_get_mount_info):
|
||||
+ m_kernel_version.return_value = (4, 20)
|
||||
+ m_get_mount_info.return_value = ["", "btrfs"]
|
||||
+
|
||||
+ cc_mounts.handle(None, self.cc, self.mock_cloud, self.mock_log, [])
|
||||
+ self.m_subp_subp.assert_has_calls([
|
||||
+ mock.call(['dd', 'if=/dev/zero',
|
||||
+ 'of=' + self.swap_path,
|
||||
+ 'bs=1M', 'count=0'], capture=True),
|
||||
+ mock.call(['mkswap', self.swap_path]),
|
||||
+ mock.call(['swapon', '-a'])])
|
||||
+
|
||||
+ @mock.patch('cloudinit.util.get_mount_info')
|
||||
+ @mock.patch('cloudinit.util.kernel_version')
|
||||
+ def test_swap_creation_method_ext4(self, m_kernel_version,
|
||||
+ m_get_mount_info):
|
||||
+ m_kernel_version.return_value = (5, 14)
|
||||
+ m_get_mount_info.return_value = ["", "ext4"]
|
||||
+
|
||||
+ cc_mounts.handle(None, self.cc, self.mock_cloud, self.mock_log, [])
|
||||
+ self.m_subp_subp.assert_has_calls([
|
||||
+ mock.call(['fallocate', '-l', '0M', self.swap_path], capture=True),
|
||||
+ mock.call(['mkswap', self.swap_path]),
|
||||
+ mock.call(['swapon', '-a'])])
|
||||
+
|
||||
+
|
||||
class TestFstabHandling(test_helpers.FilesystemMockingTestCase):
|
||||
|
||||
swap_path = '/dev/sdb1'
|
||||
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
|
||||
index 0e71db8..87dc8dd 100644
|
||||
--- a/tests/unittests/test_util.py
|
||||
+++ b/tests/unittests/test_util.py
|
||||
@@ -1177,4 +1177,19 @@ class TestGetProcEnv(helpers.TestCase):
|
||||
my_ppid = os.getppid()
|
||||
self.assertEqual(my_ppid, util.get_proc_ppid(my_pid))
|
||||
|
||||
+
|
||||
+class TestKernelVersion():
|
||||
+ """test kernel version function"""
|
||||
+
|
||||
+ params = [
|
||||
+ ('5.6.19-300.fc32.x86_64', (5, 6)),
|
||||
+ ('4.15.0-101-generic', (4, 15)),
|
||||
+ ('3.10.0-1062.12.1.vz7.131.10', (3, 10)),
|
||||
+ ('4.18.0-144.el8.x86_64', (4, 18))]
|
||||
+
|
||||
+ @mock.patch('os.uname')
|
||||
+ @pytest.mark.parametrize("uname_release,expected", params)
|
||||
+ def test_kernel_version(self, m_uname, uname_release, expected):
|
||||
+ m_uname.return_value.release = uname_release
|
||||
+ assert expected == util.kernel_version()
|
||||
# vi: ts=4 expandtab
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,164 +0,0 @@
|
|||
From 49e5a49cc007b2a751eea212b4052e92837ebc8a Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Mon, 24 Aug 2020 15:25:34 +0200
|
||||
Subject: [PATCH 1/3] Do not use fallocate in swap file creation on xfs. (#70)
|
||||
|
||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Message-id: <20200820092042.5418-2-otubo@redhat.com>
|
||||
Patchwork-id: 98194
|
||||
O-Subject: [RHEL-8.3.0 cloud-init PATCH 1/3] Do not use fallocate in swap file creation on xfs. (#70)
|
||||
Bugzilla: 1794664
|
||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
|
||||
commit 6603706eec1c39d9d591c8ffa0ef7171b74d84d6
|
||||
Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Thu Jan 23 17:41:48 2020 +0100
|
||||
|
||||
Do not use fallocate in swap file creation on xfs. (#70)
|
||||
|
||||
When creating a swap file on an xfs filesystem, fallocate cannot be used.
|
||||
Doing so results in failure of swapon and a message like:
|
||||
swapon: swapfile has holes
|
||||
|
||||
The solution here is to maintain a list (currently containing only XFS)
|
||||
of filesystems where fallocate cannot be used. The, on those fileystems
|
||||
use the slower but functional 'dd' method.
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
Co-authored-by: Adam Dobrawy <naczelnik@jawnosc.tk>
|
||||
Co-authored-by: Scott Moser <smoser@brickies.net>
|
||||
Co-authored-by: Daniel Watkins <daniel@daniel-watkins.co.uk>
|
||||
|
||||
LP: #1781781
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
cloudinit/config/cc_mounts.py | 67 ++++++++++++++++------
|
||||
.../unittests/test_handler/test_handler_mounts.py | 12 ++++
|
||||
2 files changed, 62 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py
|
||||
index c741c74..4293844 100644
|
||||
--- a/cloudinit/config/cc_mounts.py
|
||||
+++ b/cloudinit/config/cc_mounts.py
|
||||
@@ -223,13 +223,58 @@ def suggested_swapsize(memsize=None, maxsize=None, fsys=None):
|
||||
return size
|
||||
|
||||
|
||||
+def create_swapfile(fname, size):
|
||||
+ """Size is in MiB."""
|
||||
+
|
||||
+ errmsg = "Failed to create swapfile '%s' of size %dMB via %s: %s"
|
||||
+
|
||||
+ def create_swap(fname, size, method):
|
||||
+ LOG.debug("Creating swapfile in '%s' on fstype '%s' using '%s'",
|
||||
+ fname, fstype, method)
|
||||
+
|
||||
+ if method == "fallocate":
|
||||
+ cmd = ['fallocate', '-l', '%dM' % size, fname]
|
||||
+ elif method == "dd":
|
||||
+ cmd = ['dd', 'if=/dev/zero', 'of=%s' % fname, 'bs=1M',
|
||||
+ 'count=%d' % size]
|
||||
+
|
||||
+ try:
|
||||
+ util.subp(cmd, capture=True)
|
||||
+ except util.ProcessExecutionError as e:
|
||||
+ LOG.warning(errmsg, fname, size, method, e)
|
||||
+ util.del_file(fname)
|
||||
+
|
||||
+ swap_dir = os.path.dirname(fname)
|
||||
+ util.ensure_dir(swap_dir)
|
||||
+
|
||||
+ fstype = util.get_mount_info(swap_dir)[1]
|
||||
+
|
||||
+ if fstype in ("xfs", "btrfs"):
|
||||
+ create_swap(fname, size, "dd")
|
||||
+ else:
|
||||
+ try:
|
||||
+ create_swap(fname, size, "fallocate")
|
||||
+ except util.ProcessExecutionError as e:
|
||||
+ LOG.warning(errmsg, fname, size, "dd", e)
|
||||
+ LOG.warning("Will attempt with dd.")
|
||||
+ create_swap(fname, size, "dd")
|
||||
+
|
||||
+ util.chmod(fname, 0o600)
|
||||
+ try:
|
||||
+ util.subp(['mkswap', fname])
|
||||
+ except util.ProcessExecutionError:
|
||||
+ util.del_file(fname)
|
||||
+ raise
|
||||
+
|
||||
+
|
||||
def setup_swapfile(fname, size=None, maxsize=None):
|
||||
"""
|
||||
fname: full path string of filename to setup
|
||||
size: the size to create. set to "auto" for recommended
|
||||
maxsize: the maximum size
|
||||
"""
|
||||
- tdir = os.path.dirname(fname)
|
||||
+ swap_dir = os.path.dirname(fname)
|
||||
+ mibsize = str(int(size / (2 ** 20)))
|
||||
if str(size).lower() == "auto":
|
||||
try:
|
||||
memsize = util.read_meminfo()['total']
|
||||
@@ -237,28 +282,16 @@ def setup_swapfile(fname, size=None, maxsize=None):
|
||||
LOG.debug("Not creating swap: failed to read meminfo")
|
||||
return
|
||||
|
||||
- util.ensure_dir(tdir)
|
||||
- size = suggested_swapsize(fsys=tdir, maxsize=maxsize,
|
||||
+ util.ensure_dir(swap_dir)
|
||||
+ size = suggested_swapsize(fsys=swap_dir, maxsize=maxsize,
|
||||
memsize=memsize)
|
||||
|
||||
if not size:
|
||||
LOG.debug("Not creating swap: suggested size was 0")
|
||||
return
|
||||
|
||||
- mbsize = str(int(size / (2 ** 20)))
|
||||
- msg = "creating swap file '%s' of %sMB" % (fname, mbsize)
|
||||
- try:
|
||||
- util.ensure_dir(tdir)
|
||||
- util.log_time(LOG.debug, msg, func=util.subp,
|
||||
- args=[['sh', '-c',
|
||||
- ('rm -f "$1" && umask 0066 && '
|
||||
- '{ fallocate -l "${2}M" "$1" || '
|
||||
- 'dd if=/dev/zero "of=$1" bs=1M "count=$2"; } && '
|
||||
- 'mkswap "$1" || { r=$?; rm -f "$1"; exit $r; }'),
|
||||
- 'setup_swap', fname, mbsize]])
|
||||
-
|
||||
- except Exception as e:
|
||||
- raise IOError("Failed %s: %s" % (msg, e))
|
||||
+ util.log_time(LOG.debug, msg="Setting up swap file", func=create_swapfile,
|
||||
+ args=[fname, mibsize])
|
||||
|
||||
return fname
|
||||
|
||||
diff --git a/tests/unittests/test_handler/test_handler_mounts.py b/tests/unittests/test_handler/test_handler_mounts.py
|
||||
index 0fb160b..7bcefa0 100644
|
||||
--- a/tests/unittests/test_handler/test_handler_mounts.py
|
||||
+++ b/tests/unittests/test_handler/test_handler_mounts.py
|
||||
@@ -181,6 +181,18 @@ class TestFstabHandling(test_helpers.FilesystemMockingTestCase):
|
||||
|
||||
return dev
|
||||
|
||||
+ def test_swap_integrity(self):
|
||||
+ '''Ensure that the swap file is correctly created and can
|
||||
+ swapon successfully. Fixing the corner case of:
|
||||
+ kernel: swapon: swapfile has holes'''
|
||||
+
|
||||
+ fstab = '/swap.img swap swap defaults 0 0\n'
|
||||
+
|
||||
+ with open(cc_mounts.FSTAB_PATH, 'w') as fd:
|
||||
+ fd.write(fstab)
|
||||
+ cc = {'swap': ['filename: /swap.img', 'size: 512', 'maxsize: 512']}
|
||||
+ cc_mounts.handle(None, cc, self.mock_cloud, self.mock_log, [])
|
||||
+
|
||||
def test_fstab_no_swap_device(self):
|
||||
'''Ensure that cloud-init adds a discovered swap partition
|
||||
to /etc/fstab.'''
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
From 251836a62eb3061b8d26177fd5997a96dccec21b Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Thu, 28 May 2020 08:44:06 +0200
|
||||
Subject: [PATCH 3/4] 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 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg
|
||||
index 82e8bf6..9ecba21 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
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,303 +0,0 @@
|
|||
From 02924179d423c919d0d46e6149da5bb8d26dd0d5 Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Tue, 3 Nov 2020 12:16:37 +0100
|
||||
Subject: [PATCH 4/5] Explicit set IPV6_AUTOCONF and IPV6_FORCE_ACCEPT_RA on
|
||||
static6 (#634)
|
||||
|
||||
RH-Author: Eduardo Terrell Ferrari Otubo (eterrell)
|
||||
RH-MergeRequest: 17: Explicit set IPV6_AUTOCONF and IPV6_FORCE_ACCEPT_RA on static6 (#634)
|
||||
RH-Commit: [1/2] ba604c675f7c54a3e1768945a9ba77918ca4a57b (eterrell/cloud-init)
|
||||
RH-Bugzilla: 1894015
|
||||
|
||||
commit b46e4a8cff667c8441622089cf7d57aeb88220cd
|
||||
Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Thu Oct 29 15:05:42 2020 +0100
|
||||
|
||||
Explicit set IPV6_AUTOCONF and IPV6_FORCE_ACCEPT_RA on static6 (#634)
|
||||
|
||||
The static and static6 subnet types for network_data.json were
|
||||
being ignored by the Openstack handler, this would cause the code to
|
||||
break and not function properly.
|
||||
|
||||
As of today, if a static6 configuration is chosen, the interface will
|
||||
still eventually be available to receive router advertisements or be set
|
||||
from NetworkManager to wait for them and cycle the interface in negative
|
||||
case.
|
||||
|
||||
It is safe to assume that if the interface is manually configured to use
|
||||
static ipv6 address, there's no need to wait for router advertisements.
|
||||
This patch will set automatically IPV6_AUTOCONF and IPV6_FORCE_ACCEPT_RA
|
||||
both to "no" in this case.
|
||||
|
||||
This patch fixes the specific behavior only for RHEL flavor and
|
||||
sysconfig renderer. It also introduces new unit tests for the specific
|
||||
case as well as adjusts some existent tests to be compatible with the
|
||||
new options. This patch also addresses this problem by assigning the
|
||||
appropriate subnet type for each case on the openstack handler.
|
||||
|
||||
rhbz: #1889635
|
||||
rhbz: #1889635
|
||||
|
||||
Signed-off-by: Eduardo Otubo otubo@redhat.com
|
||||
|
||||
Conflicts:
|
||||
* The context of the patches are slightly different from upstream since
|
||||
the there is more code added around the changes. But nothing interfering
|
||||
on the patches.
|
||||
* One minor conflict, removed the "flavor == 'rhel'" check because the
|
||||
commit that introduced this change is after the 19.4 release. No harm
|
||||
done since this commit is intended to be shipped to RHEL only anyways.
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
---
|
||||
cloudinit/net/network_state.py | 3 +-
|
||||
cloudinit/net/sysconfig.py | 4 +
|
||||
cloudinit/sources/helpers/openstack.py | 8 +-
|
||||
tests/unittests/test_distros/test_netconfig.py | 2 +
|
||||
tests/unittests/test_net.py | 100 +++++++++++++++++++++++++
|
||||
5 files changed, 115 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py
|
||||
index f3e8e25..2525fc9 100644
|
||||
--- a/cloudinit/net/network_state.py
|
||||
+++ b/cloudinit/net/network_state.py
|
||||
@@ -822,7 +822,8 @@ def _normalize_subnet(subnet):
|
||||
|
||||
if subnet.get('type') in ('static', 'static6'):
|
||||
normal_subnet.update(
|
||||
- _normalize_net_keys(normal_subnet, address_keys=('address',)))
|
||||
+ _normalize_net_keys(normal_subnet, address_keys=(
|
||||
+ 'address', 'ip_address',)))
|
||||
normal_subnet['routes'] = [_normalize_route(r)
|
||||
for r in subnet.get('routes', [])]
|
||||
|
||||
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
||||
index 4b4ed09..4210544 100644
|
||||
--- a/cloudinit/net/sysconfig.py
|
||||
+++ b/cloudinit/net/sysconfig.py
|
||||
@@ -401,6 +401,10 @@ class Renderer(renderer.Renderer):
|
||||
' because ipv4 subnet-level mtu:%s provided.',
|
||||
iface_cfg.name, iface_cfg[mtu_key], subnet['mtu'])
|
||||
iface_cfg[mtu_key] = subnet['mtu']
|
||||
+
|
||||
+ if subnet_is_ipv6(subnet):
|
||||
+ iface_cfg['IPV6_FORCE_ACCEPT_RA'] = False
|
||||
+ iface_cfg['IPV6_AUTOCONF'] = False
|
||||
elif subnet_type == 'manual':
|
||||
# If the subnet has an MTU setting, then ONBOOT=True
|
||||
# to apply the setting
|
||||
diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py
|
||||
index 0778f45..6ef4f90 100644
|
||||
--- a/cloudinit/sources/helpers/openstack.py
|
||||
+++ b/cloudinit/sources/helpers/openstack.py
|
||||
@@ -592,11 +592,17 @@ def convert_net_json(network_json=None, known_macs=None):
|
||||
elif network['type'] in ['ipv6_slaac', 'ipv6_dhcpv6-stateless',
|
||||
'ipv6_dhcpv6-stateful']:
|
||||
subnet.update({'type': network['type']})
|
||||
- elif network['type'] in ['ipv4', 'ipv6']:
|
||||
+ elif network['type'] in ['ipv4', 'static']:
|
||||
subnet.update({
|
||||
'type': 'static',
|
||||
'address': network.get('ip_address'),
|
||||
})
|
||||
+ elif network['type'] in ['ipv6', 'static6']:
|
||||
+ cfg.update({'accept-ra': False})
|
||||
+ subnet.update({
|
||||
+ 'type': 'static6',
|
||||
+ 'address': network.get('ip_address'),
|
||||
+ })
|
||||
|
||||
# Enable accept_ra for stateful and legacy ipv6_dhcp types
|
||||
if network['type'] in ['ipv6_dhcpv6-stateful', 'ipv6_dhcp']:
|
||||
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
|
||||
index 4ea4203..b85a333 100644
|
||||
--- a/tests/unittests/test_distros/test_netconfig.py
|
||||
+++ b/tests/unittests/test_distros/test_netconfig.py
|
||||
@@ -673,7 +673,9 @@ class TestNetCfgDistroOpensuse(TestNetCfgDistroBase):
|
||||
IPADDR6=2607:f0d0:1002:0011::2/64
|
||||
IPV6ADDR=2607:f0d0:1002:0011::2/64
|
||||
IPV6INIT=yes
|
||||
+ IPV6_AUTOCONF=no
|
||||
IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
|
||||
+ IPV6_FORCE_ACCEPT_RA=no
|
||||
NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
||||
index 2eedb12..b2b7c4b 100644
|
||||
--- a/tests/unittests/test_net.py
|
||||
+++ b/tests/unittests/test_net.py
|
||||
@@ -768,7 +768,9 @@ IPADDR6_2=2001:DB10::10/64
|
||||
IPV6ADDR=2001:DB8::10/64
|
||||
IPV6ADDR_SECONDARIES="2001:DB9::10/64 2001:DB10::10/64"
|
||||
IPV6INIT=yes
|
||||
+IPV6_AUTOCONF=no
|
||||
IPV6_DEFAULTGW=2001:DB8::1
|
||||
+IPV6_FORCE_ACCEPT_RA=no
|
||||
NETMASK=255.255.252.0
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
@@ -1016,6 +1018,8 @@ NETWORK_CONFIGS = {
|
||||
IPADDR6=2001:1::1/64
|
||||
IPV6ADDR=2001:1::1/64
|
||||
IPV6INIT=yes
|
||||
+ IPV6_AUTOCONF=no
|
||||
+ IPV6_FORCE_ACCEPT_RA=no
|
||||
NETMASK=255.255.255.0
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
@@ -1201,6 +1205,33 @@ NETWORK_CONFIGS = {
|
||||
"""),
|
||||
},
|
||||
},
|
||||
+ 'static6': {
|
||||
+ 'yaml': textwrap.dedent("""\
|
||||
+ version: 1
|
||||
+ config:
|
||||
+ - type: 'physical'
|
||||
+ name: 'iface0'
|
||||
+ accept-ra: 'no'
|
||||
+ subnets:
|
||||
+ - type: 'static6'
|
||||
+ address: 2001:1::1/64
|
||||
+ """).rstrip(' '),
|
||||
+ 'expected_sysconfig_rhel': {
|
||||
+ 'ifcfg-iface0': textwrap.dedent("""\
|
||||
+ BOOTPROTO=none
|
||||
+ DEVICE=iface0
|
||||
+ IPV6ADDR=2001:1::1/64
|
||||
+ IPV6INIT=yes
|
||||
+ IPV6_AUTOCONF=no
|
||||
+ IPV6_FORCE_ACCEPT_RA=no
|
||||
+ DEVICE=iface0
|
||||
+ NM_CONTROLLED=no
|
||||
+ ONBOOT=yes
|
||||
+ TYPE=Ethernet
|
||||
+ USERCTL=no
|
||||
+ """),
|
||||
+ },
|
||||
+ },
|
||||
'dhcpv6_stateless': {
|
||||
'expected_eni': textwrap.dedent("""\
|
||||
auto lo
|
||||
@@ -1507,6 +1538,8 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
||||
IPADDR6=2001:1::1/64
|
||||
IPV6ADDR=2001:1::1/64
|
||||
IPV6INIT=yes
|
||||
+ IPV6_AUTOCONF=no
|
||||
+ IPV6_FORCE_ACCEPT_RA=no
|
||||
IPV6_DEFAULTGW=2001:4800:78ff:1b::1
|
||||
MACADDR=bb:bb:bb:bb:bb:aa
|
||||
NETMASK=255.255.255.0
|
||||
@@ -2067,6 +2100,8 @@ iface bond0 inet6 static
|
||||
IPADDR6=2001:1::1/92
|
||||
IPV6ADDR=2001:1::1/92
|
||||
IPV6INIT=yes
|
||||
+ IPV6_AUTOCONF=no
|
||||
+ IPV6_FORCE_ACCEPT_RA=no
|
||||
MTU=9000
|
||||
NETMASK=255.255.255.0
|
||||
NETMASK1=255.255.255.0
|
||||
@@ -2154,6 +2189,8 @@ iface bond0 inet6 static
|
||||
IPADDR6=2001:1::bbbb/96
|
||||
IPV6ADDR=2001:1::bbbb/96
|
||||
IPV6INIT=yes
|
||||
+ IPV6_AUTOCONF=no
|
||||
+ IPV6_FORCE_ACCEPT_RA=no
|
||||
IPV6_DEFAULTGW=2001:1::1
|
||||
MTU=2222
|
||||
NETMASK=255.255.255.0
|
||||
@@ -2213,6 +2250,9 @@ iface bond0 inet6 static
|
||||
IPADDR6=2001:1::100/96
|
||||
IPV6ADDR=2001:1::100/96
|
||||
IPV6INIT=yes
|
||||
+ IPV6_AUTOCONF=no
|
||||
+ IPV6_FORCE_ACCEPT_RA=no
|
||||
+ NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -2226,6 +2266,9 @@ iface bond0 inet6 static
|
||||
IPADDR6=2001:1::101/96
|
||||
IPV6ADDR=2001:1::101/96
|
||||
IPV6INIT=yes
|
||||
+ IPV6_AUTOCONF=no
|
||||
+ IPV6_FORCE_ACCEPT_RA=no
|
||||
+ NM_CONTROLLED=no
|
||||
ONBOOT=yes
|
||||
STARTMODE=auto
|
||||
TYPE=Ethernet
|
||||
@@ -3015,6 +3058,61 @@ USERCTL=no
|
||||
self._compare_files_to_expected(entry[self.expected_name], found)
|
||||
self._assert_headers(found)
|
||||
|
||||
+ def test_stattic6_from_json(self):
|
||||
+ net_json = {
|
||||
+ "services": [{"type": "dns", "address": "172.19.0.12"}],
|
||||
+ "networks": [{
|
||||
+ "network_id": "dacd568d-5be6-4786-91fe-750c374b78b4",
|
||||
+ "type": "ipv4", "netmask": "255.255.252.0",
|
||||
+ "link": "tap1a81968a-79",
|
||||
+ "routes": [{
|
||||
+ "netmask": "0.0.0.0",
|
||||
+ "network": "0.0.0.0",
|
||||
+ "gateway": "172.19.3.254",
|
||||
+ }, {
|
||||
+ "netmask": "0.0.0.0", # A second default gateway
|
||||
+ "network": "0.0.0.0",
|
||||
+ "gateway": "172.20.3.254",
|
||||
+ }],
|
||||
+ "ip_address": "172.19.1.34", "id": "network0"
|
||||
+ }, {
|
||||
+ "network_id": "mgmt",
|
||||
+ "netmask": "ffff:ffff:ffff:ffff::",
|
||||
+ "link": "interface1",
|
||||
+ "mode": "link-local",
|
||||
+ "routes": [],
|
||||
+ "ip_address": "fe80::c096:67ff:fe5c:6e84",
|
||||
+ "type": "static6",
|
||||
+ "id": "network1",
|
||||
+ "services": [],
|
||||
+ "accept-ra": "false"
|
||||
+ }],
|
||||
+ "links": [
|
||||
+ {
|
||||
+ "ethernet_mac_address": "fa:16:3e:ed:9a:59",
|
||||
+ "mtu": None, "type": "bridge", "id":
|
||||
+ "tap1a81968a-79",
|
||||
+ "vif_id": "1a81968a-797a-400f-8a80-567f997eb93f"
|
||||
+ },
|
||||
+ ],
|
||||
+ }
|
||||
+ macs = {'fa:16:3e:ed:9a:59': 'eth0'}
|
||||
+ render_dir = self.tmp_dir()
|
||||
+ network_cfg = openstack.convert_net_json(net_json, known_macs=macs)
|
||||
+ ns = network_state.parse_net_config_data(network_cfg,
|
||||
+ skip_broken=False)
|
||||
+ renderer = self._get_renderer()
|
||||
+ with self.assertRaises(ValueError):
|
||||
+ renderer.render_network_state(ns, target=render_dir)
|
||||
+ self.assertEqual([], os.listdir(render_dir))
|
||||
+
|
||||
+ def test_static6_from_yaml(self):
|
||||
+ entry = NETWORK_CONFIGS['static6']
|
||||
+ found = self._render_and_read(network_config=yaml.load(
|
||||
+ entry['yaml']))
|
||||
+ self._compare_files_to_expected(entry[self.expected_name], found)
|
||||
+ self._assert_headers(found)
|
||||
+
|
||||
def test_dhcpv6_reject_ra_config_v2(self):
|
||||
entry = NETWORK_CONFIGS['dhcpv6_reject_ra']
|
||||
found = self._render_and_read(network_config=yaml.load(
|
||||
@@ -3133,6 +3231,8 @@ USERCTL=no
|
||||
IPADDR6=2001:db8::100/32
|
||||
IPV6ADDR=2001:db8::100/32
|
||||
IPV6INIT=yes
|
||||
+ IPV6_AUTOCONF=no
|
||||
+ IPV6_FORCE_ACCEPT_RA=no
|
||||
IPV6_DEFAULTGW=2001:db8::1
|
||||
NETMASK=255.255.255.0
|
||||
NM_CONTROLLED=no
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
From 301b1770d3e2580c3ee168261a9a97d143cc5f59 Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Mon, 1 Jun 2020 11:58:06 +0200
|
||||
Subject: [PATCH] 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>
|
||||
---
|
||||
rhel/systemd/cloud-init.service | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/rhel/systemd/cloud-init.service b/rhel/systemd/cloud-init.service
|
||||
index d0023a0..0b3d796 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
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
From 0422ba0e773d1a8257a3f2bf3db05f3bc7917eb7 Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Thu, 28 May 2020 08:44:08 +0200
|
||||
Subject: [PATCH 4/4] 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>
|
||||
---
|
||||
rhel/systemd/cloud-final.service | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/rhel/systemd/cloud-final.service b/rhel/systemd/cloud-final.service
|
||||
index f303483..05add07 100644
|
||||
--- a/rhel/systemd/cloud-final.service
|
||||
+++ b/rhel/systemd/cloud-final.service
|
||||
@@ -11,8 +11,8 @@ ExecStart=/usr/bin/cloud-init modules --mode=final
|
||||
RemainAfterExit=yes
|
||||
TimeoutSec=0
|
||||
KillMode=process
|
||||
-ExecStartPost=/bin/echo "try restart NetworkManager.service"
|
||||
-ExecStartPost=/usr/bin/systemctl try-restart NetworkManager.service
|
||||
+ExecStartPost=/bin/echo "trying to reload or restart NetworkManager.service"
|
||||
+ExecStartPost=/usr/bin/systemctl try-reload-or-restart NetworkManager.service
|
||||
|
||||
# Output needs to appear in instance console output
|
||||
StandardOutput=journal+console
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
From 07755100b11abd4d429577f9f3f57a2c43592089 Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Mon, 17 Aug 2020 11:14:45 +0200
|
||||
Subject: [PATCH 1/2] When tools.conf does not exist, running cmd
|
||||
"vmware-toolbox-cmd config get deployPkg enable-custom-scripts", the return
|
||||
code will be EX_UNAVAILABLE(69), on this condition, it should not take it as
|
||||
error. (#413)
|
||||
|
||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Message-id: <20200710094434.9711-1-otubo@redhat.com>
|
||||
Patchwork-id: 97934
|
||||
O-Subject: [RHEL-7.9.z/RHEL-8.2.1/RHEL-8.3.0 cloud-init PATCH] When tools.conf does not exist, running cmd "vmware-toolbox-cmd config get deployPkg enable-custom-scripts", the return code will be EX_UNAVAILABLE(69), on this condition, it should not take it as error. (#413)
|
||||
Bugzilla: 1839662
|
||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
|
||||
From: chengcheng-chcheng <63850735+chengcheng-chcheng@users.noreply.github.com>
|
||||
|
||||
The diff seems slightly different from upstream because of some parts
|
||||
being in different positions. But the final result is the file patched
|
||||
guestcust_util.py (within this block) exactly identical to the one
|
||||
upstream.
|
||||
|
||||
Also: Sorry for the commit message being just a Subject and this being
|
||||
enormous. I kept the original from upstream.
|
||||
|
||||
commit c6d09af67626c2f2241c64c10c9e27e8752ba87b
|
||||
Author: chengcheng-chcheng <63850735+chengcheng-chcheng@users.noreply.github.com>
|
||||
Date: Wed Jun 10 00:20:47 2020 +0800
|
||||
|
||||
When tools.conf does not exist, running cmd "vmware-toolbox-cmd config get deployPkg enable-custom-scripts", the return code will be EX_UNAVAILABLE(69), on this condition, it should not take it as error. (#413)
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
.../sources/helpers/vmware/imc/guestcust_util.py | 33 +++++++++++++---------
|
||||
1 file changed, 20 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/cloudinit/sources/helpers/vmware/imc/guestcust_util.py b/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
|
||||
index 3d369d0..a270d9f 100644
|
||||
--- a/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
|
||||
+++ b/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
|
||||
@@ -133,23 +133,30 @@ def get_tools_config(section, key, defaultVal):
|
||||
'vmware-toolbox-cmd not installed, returning default value')
|
||||
return defaultVal
|
||||
|
||||
- retValue = defaultVal
|
||||
cmd = ['vmware-toolbox-cmd', 'config', 'get', section, key]
|
||||
|
||||
try:
|
||||
- (outText, _) = util.subp(cmd)
|
||||
- m = re.match(r'([^=]+)=(.*)', outText)
|
||||
- if m:
|
||||
- retValue = m.group(2).strip()
|
||||
- logger.debug("Get tools config: [%s] %s = %s",
|
||||
- section, key, retValue)
|
||||
- else:
|
||||
+ (outText, _) = subp.subp(cmd)
|
||||
+ except subp.ProcessExecutionError as e:
|
||||
+ if e.exit_code == 69:
|
||||
logger.debug(
|
||||
- "Tools config: [%s] %s is not found, return default value: %s",
|
||||
- section, key, retValue)
|
||||
- except util.ProcessExecutionError as e:
|
||||
- logger.error("Failed running %s[%s]", cmd, e.exit_code)
|
||||
- logger.exception(e)
|
||||
+ "vmware-toolbox-cmd returned 69 (unavailable) for cmd: %s."
|
||||
+ " Return default value: %s", " ".join(cmd), defaultVal)
|
||||
+ else:
|
||||
+ logger.error("Failed running %s[%s]", cmd, e.exit_code)
|
||||
+ logger.exception(e)
|
||||
+ return defaultVal
|
||||
+
|
||||
+ retValue = defaultVal
|
||||
+ m = re.match(r'([^=]+)=(.*)', outText)
|
||||
+ if m:
|
||||
+ retValue = m.group(2).strip()
|
||||
+ logger.debug("Get tools config: [%s] %s = %s",
|
||||
+ section, key, retValue)
|
||||
+ else:
|
||||
+ logger.debug(
|
||||
+ "Tools config: [%s] %s is not found, return default value: %s",
|
||||
+ section, key, retValue)
|
||||
|
||||
return retValue
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
From c3a019b57cade8e6c3963f6bd2c7c15cd67e561c Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Wed, 2 Sep 2020 14:59:06 +0200
|
||||
Subject: [PATCH] cc_mounts: fix incorrect format specifiers (#316)
|
||||
|
||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Message-id: <20200825131749.4989-1-otubo@redhat.com>
|
||||
Patchwork-id: 98217
|
||||
O-Subject: [RHEL-8.3.0 cloud-init PATCH] cc_mounts: fix incorrect format specifiers (#316)
|
||||
Bugzilla: 1794664
|
||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||
|
||||
Conflicts: Not exactly a conflict, but removed optional notations
|
||||
"variable: type" and "-> type" from function header create_swapfile() as
|
||||
it is only available on Python >= 3.5 and this patch is for RHEL-7.9
|
||||
only (Python 2.*). The rest of the cherry-pick was clean.
|
||||
|
||||
commit 9d7b35ce23aaf8741dd49b16e359c96591be3c76
|
||||
Author: Daniel Watkins <oddbloke@ubuntu.com>
|
||||
Date: Wed Apr 15 16:53:08 2020 -0400
|
||||
|
||||
cc_mounts: fix incorrect format specifiers (#316)
|
||||
|
||||
LP: #1872836
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
cloudinit/config/cc_mounts.py | 6 +++---
|
||||
cloudinit/config/tests/test_mounts.py | 22 ++++++++++++++++++++++
|
||||
2 files changed, 25 insertions(+), 3 deletions(-)
|
||||
create mode 100644 cloudinit/config/tests/test_mounts.py
|
||||
|
||||
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py
|
||||
index e1c43e3..55b6770 100644
|
||||
--- a/cloudinit/config/cc_mounts.py
|
||||
+++ b/cloudinit/config/cc_mounts.py
|
||||
@@ -226,17 +226,17 @@ def suggested_swapsize(memsize=None, maxsize=None, fsys=None):
|
||||
def create_swapfile(fname, size):
|
||||
"""Size is in MiB."""
|
||||
|
||||
- errmsg = "Failed to create swapfile '%s' of size %dMB via %s: %s"
|
||||
+ errmsg = "Failed to create swapfile '%s' of size %sMB via %s: %s"
|
||||
|
||||
def create_swap(fname, size, method):
|
||||
LOG.debug("Creating swapfile in '%s' on fstype '%s' using '%s'",
|
||||
fname, fstype, method)
|
||||
|
||||
if method == "fallocate":
|
||||
- cmd = ['fallocate', '-l', '%dM' % size, fname]
|
||||
+ cmd = ['fallocate', '-l', '%sM' % size, fname]
|
||||
elif method == "dd":
|
||||
cmd = ['dd', 'if=/dev/zero', 'of=%s' % fname, 'bs=1M',
|
||||
- 'count=%d' % size]
|
||||
+ 'count=%s' % size]
|
||||
|
||||
try:
|
||||
util.subp(cmd, capture=True)
|
||||
diff --git a/cloudinit/config/tests/test_mounts.py b/cloudinit/config/tests/test_mounts.py
|
||||
new file mode 100644
|
||||
index 0000000..c7dad61
|
||||
--- /dev/null
|
||||
+++ b/cloudinit/config/tests/test_mounts.py
|
||||
@@ -0,0 +1,22 @@
|
||||
+# This file is part of cloud-init. See LICENSE file for license information.
|
||||
+from unittest import mock
|
||||
+
|
||||
+from cloudinit.config.cc_mounts import create_swapfile
|
||||
+
|
||||
+
|
||||
+M_PATH = 'cloudinit.config.cc_mounts.'
|
||||
+
|
||||
+
|
||||
+class TestCreateSwapfile:
|
||||
+
|
||||
+ @mock.patch(M_PATH + 'util.subp')
|
||||
+ def test_happy_path(self, m_subp, tmpdir):
|
||||
+ swap_file = tmpdir.join("swap-file")
|
||||
+ fname = str(swap_file)
|
||||
+
|
||||
+ # Some of the calls to util.subp should create the swap file; this
|
||||
+ # roughly approximates that
|
||||
+ m_subp.side_effect = lambda *args, **kwargs: swap_file.write('')
|
||||
+
|
||||
+ create_swapfile(fname, '')
|
||||
+ assert mock.call(['mkswap', fname]) in m_subp.call_args_list
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
From e7a0cd9aa71dfd7715eca4b393db0aa348e05f8f Mon Sep 17 00:00:00 2001
|
||||
From: jmaloy <jmaloy@redhat.com>
|
||||
Date: Thu, 28 May 2020 08:43:58 +0200
|
||||
Subject: [PATCH 1/4] cc_set_password: increase random pwlength from 9 to 20
|
||||
(#189)
|
||||
|
||||
RH-Author: jmaloy <jmaloy@redhat.com>
|
||||
Message-id: <20200313015002.3297-2-jmaloy@redhat.com>
|
||||
Patchwork-id: 94253
|
||||
O-Subject: [RHEL-8.2 cloud-init PATCH 1/1] cc_set_password: increase random pwlength from 9 to 20 (#189)
|
||||
Bugzilla: 1812171
|
||||
RH-Acked-by: Eduardo Otubo <eterrell@redhat.com>
|
||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
|
||||
From: Ryan Harper <ryan.harper@canonical.com>
|
||||
|
||||
Increasing the bits of security from 52 to 115.
|
||||
|
||||
LP: #1860795
|
||||
(cherry picked from commit 42788bf24a1a0a5421a2d00a7f59b59e38ba1a14)
|
||||
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
cloudinit/config/cc_set_passwords.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py
|
||||
index c3c5b0f..0742234 100755
|
||||
--- a/cloudinit/config/cc_set_passwords.py
|
||||
+++ b/cloudinit/config/cc_set_passwords.py
|
||||
@@ -236,7 +236,7 @@ def handle(_name, cfg, cloud, log, args):
|
||||
raise errors[-1]
|
||||
|
||||
|
||||
-def rand_user_password(pwlen=9):
|
||||
+def rand_user_password(pwlen=20):
|
||||
return util.rand_str(pwlen, select_from=PW_SET)
|
||||
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
From f67f56e85c0fdb1c94527a6a1795bbacd2e6fdb0 Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Wed, 24 Jun 2020 07:34:34 +0200
|
||||
Subject: [PATCH 4/4] cloud-init.service.tmpl: use "rhel" instead of "redhat"
|
||||
(#452)
|
||||
|
||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Message-id: <20200623154034.28563-4-otubo@redhat.com>
|
||||
Patchwork-id: 97784
|
||||
O-Subject: [RHEL-8.3.0/RHEL-8.2.1 cloud-init PATCH 3/3] cloud-init.service.tmpl: use "rhel" instead of "redhat" (#452)
|
||||
Bugzilla: 1834173
|
||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
|
||||
From: Daniel Watkins <oddbloke@ubuntu.com>
|
||||
|
||||
commit ddc4c2de1b1e716b31384af92f5356bfc6136944
|
||||
Author: Daniel Watkins <oddbloke@ubuntu.com>
|
||||
Date: Tue Jun 23 09:43:04 2020 -0400
|
||||
|
||||
cloud-init.service.tmpl: use "rhel" instead of "redhat" (#452)
|
||||
|
||||
We use "rhel" consistently everywhere else.
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
systemd/cloud-init.service.tmpl | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
|
||||
index 9ad3574..af6d9a8 100644
|
||||
--- a/systemd/cloud-init.service.tmpl
|
||||
+++ b/systemd/cloud-init.service.tmpl
|
||||
@@ -10,7 +10,7 @@ After=systemd-networkd-wait-online.service
|
||||
{% if variant in ["ubuntu", "unknown", "debian"] %}
|
||||
After=networking.service
|
||||
{% endif %}
|
||||
-{% if variant in ["centos", "fedora", "redhat"] %}
|
||||
+{% if variant in ["centos", "fedora", "rhel"] %}
|
||||
After=network.service
|
||||
After=NetworkManager.service
|
||||
{% endif %}
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,350 +0,0 @@
|
|||
From f6dc3cf39a4884657478a47894ce8a76ec9a72c5 Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Wed, 24 Jun 2020 07:34:29 +0200
|
||||
Subject: [PATCH 1/4] ec2: Do not log IMDSv2 token values, instead use REDACTED
|
||||
(#219)
|
||||
|
||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Message-id: <20200505082940.18316-1-otubo@redhat.com>
|
||||
Patchwork-id: 96264
|
||||
O-Subject: [RHEL-7.9/RHEL-8.3 cloud-init PATCH] ec2: Do not log IMDSv2 token values, instead use REDACTED (#219)
|
||||
Bugzilla: 1822343
|
||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
|
||||
Note: There's no RHEL-8.3/cloud-init-19.4 branch yet, but it should be
|
||||
queued to be applied on top of it when it's created.
|
||||
|
||||
commit 87cd040ed8fe7195cbb357ed3bbf53cd2a81436c
|
||||
Author: Ryan Harper <ryan.harper@canonical.com>
|
||||
Date: Wed Feb 19 15:01:09 2020 -0600
|
||||
|
||||
ec2: Do not log IMDSv2 token values, instead use REDACTED (#219)
|
||||
|
||||
Instead of logging the token values used log the headers and replace the actual
|
||||
values with the string 'REDACTED'. This allows users to examine cloud-init.log
|
||||
and see that the IMDSv2 token header is being used but avoids leaving the value
|
||||
used in the log file itself.
|
||||
|
||||
LP: #1863943
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
cloudinit/ec2_utils.py | 12 ++++++++--
|
||||
cloudinit/sources/DataSourceEc2.py | 35 +++++++++++++++++++----------
|
||||
cloudinit/url_helper.py | 27 ++++++++++++++++------
|
||||
tests/unittests/test_datasource/test_ec2.py | 17 ++++++++++++++
|
||||
4 files changed, 70 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/cloudinit/ec2_utils.py b/cloudinit/ec2_utils.py
|
||||
index 57708c1..34acfe8 100644
|
||||
--- a/cloudinit/ec2_utils.py
|
||||
+++ b/cloudinit/ec2_utils.py
|
||||
@@ -142,7 +142,8 @@ def skip_retry_on_codes(status_codes, _request_args, cause):
|
||||
def get_instance_userdata(api_version='latest',
|
||||
metadata_address='http://169.254.169.254',
|
||||
ssl_details=None, timeout=5, retries=5,
|
||||
- headers_cb=None, exception_cb=None):
|
||||
+ headers_cb=None, headers_redact=None,
|
||||
+ exception_cb=None):
|
||||
ud_url = url_helper.combine_url(metadata_address, api_version)
|
||||
ud_url = url_helper.combine_url(ud_url, 'user-data')
|
||||
user_data = ''
|
||||
@@ -155,7 +156,8 @@ def get_instance_userdata(api_version='latest',
|
||||
SKIP_USERDATA_CODES)
|
||||
response = url_helper.read_file_or_url(
|
||||
ud_url, ssl_details=ssl_details, timeout=timeout,
|
||||
- retries=retries, exception_cb=exception_cb, headers_cb=headers_cb)
|
||||
+ retries=retries, exception_cb=exception_cb, headers_cb=headers_cb,
|
||||
+ headers_redact=headers_redact)
|
||||
user_data = response.contents
|
||||
except url_helper.UrlError as e:
|
||||
if e.code not in SKIP_USERDATA_CODES:
|
||||
@@ -169,11 +171,13 @@ def _get_instance_metadata(tree, api_version='latest',
|
||||
metadata_address='http://169.254.169.254',
|
||||
ssl_details=None, timeout=5, retries=5,
|
||||
leaf_decoder=None, headers_cb=None,
|
||||
+ headers_redact=None,
|
||||
exception_cb=None):
|
||||
md_url = url_helper.combine_url(metadata_address, api_version, tree)
|
||||
caller = functools.partial(
|
||||
url_helper.read_file_or_url, ssl_details=ssl_details,
|
||||
timeout=timeout, retries=retries, headers_cb=headers_cb,
|
||||
+ headers_redact=headers_redact,
|
||||
exception_cb=exception_cb)
|
||||
|
||||
def mcaller(url):
|
||||
@@ -197,6 +201,7 @@ def get_instance_metadata(api_version='latest',
|
||||
metadata_address='http://169.254.169.254',
|
||||
ssl_details=None, timeout=5, retries=5,
|
||||
leaf_decoder=None, headers_cb=None,
|
||||
+ headers_redact=None,
|
||||
exception_cb=None):
|
||||
# Note, 'meta-data' explicitly has trailing /.
|
||||
# this is required for CloudStack (LP: #1356855)
|
||||
@@ -204,6 +209,7 @@ def get_instance_metadata(api_version='latest',
|
||||
metadata_address=metadata_address,
|
||||
ssl_details=ssl_details, timeout=timeout,
|
||||
retries=retries, leaf_decoder=leaf_decoder,
|
||||
+ headers_redact=headers_redact,
|
||||
headers_cb=headers_cb,
|
||||
exception_cb=exception_cb)
|
||||
|
||||
@@ -212,12 +218,14 @@ def get_instance_identity(api_version='latest',
|
||||
metadata_address='http://169.254.169.254',
|
||||
ssl_details=None, timeout=5, retries=5,
|
||||
leaf_decoder=None, headers_cb=None,
|
||||
+ headers_redact=None,
|
||||
exception_cb=None):
|
||||
return _get_instance_metadata(tree='dynamic/instance-identity',
|
||||
api_version=api_version,
|
||||
metadata_address=metadata_address,
|
||||
ssl_details=ssl_details, timeout=timeout,
|
||||
retries=retries, leaf_decoder=leaf_decoder,
|
||||
+ headers_redact=headers_redact,
|
||||
headers_cb=headers_cb,
|
||||
exception_cb=exception_cb)
|
||||
# vi: ts=4 expandtab
|
||||
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
|
||||
index b9f346a..0f2bfef 100644
|
||||
--- a/cloudinit/sources/DataSourceEc2.py
|
||||
+++ b/cloudinit/sources/DataSourceEc2.py
|
||||
@@ -31,6 +31,9 @@ STRICT_ID_DEFAULT = "warn"
|
||||
API_TOKEN_ROUTE = 'latest/api/token'
|
||||
API_TOKEN_DISABLED = '_ec2_disable_api_token'
|
||||
AWS_TOKEN_TTL_SECONDS = '21600'
|
||||
+AWS_TOKEN_PUT_HEADER = 'X-aws-ec2-metadata-token'
|
||||
+AWS_TOKEN_REQ_HEADER = AWS_TOKEN_PUT_HEADER + '-ttl-seconds'
|
||||
+AWS_TOKEN_REDACT = [AWS_TOKEN_PUT_HEADER, AWS_TOKEN_REQ_HEADER]
|
||||
|
||||
|
||||
class CloudNames(object):
|
||||
@@ -158,7 +161,8 @@ class DataSourceEc2(sources.DataSource):
|
||||
for api_ver in self.extended_metadata_versions:
|
||||
url = url_tmpl.format(self.metadata_address, api_ver)
|
||||
try:
|
||||
- resp = uhelp.readurl(url=url, headers=headers)
|
||||
+ resp = uhelp.readurl(url=url, headers=headers,
|
||||
+ headers_redact=AWS_TOKEN_REDACT)
|
||||
except uhelp.UrlError as e:
|
||||
LOG.debug('url %s raised exception %s', url, e)
|
||||
else:
|
||||
@@ -180,6 +184,7 @@ class DataSourceEc2(sources.DataSource):
|
||||
self.identity = ec2.get_instance_identity(
|
||||
api_version, self.metadata_address,
|
||||
headers_cb=self._get_headers,
|
||||
+ headers_redact=AWS_TOKEN_REDACT,
|
||||
exception_cb=self._refresh_stale_aws_token_cb).get(
|
||||
'document', {})
|
||||
return self.identity.get(
|
||||
@@ -205,7 +210,8 @@ class DataSourceEc2(sources.DataSource):
|
||||
LOG.debug('Fetching Ec2 IMDSv2 API Token')
|
||||
url, response = uhelp.wait_for_url(
|
||||
urls=urls, max_wait=1, timeout=1, status_cb=self._status_cb,
|
||||
- headers_cb=self._get_headers, request_method=request_method)
|
||||
+ headers_cb=self._get_headers, request_method=request_method,
|
||||
+ headers_redact=AWS_TOKEN_REDACT)
|
||||
|
||||
if url and response:
|
||||
self._api_token = response
|
||||
@@ -252,7 +258,8 @@ class DataSourceEc2(sources.DataSource):
|
||||
url, _ = uhelp.wait_for_url(
|
||||
urls=urls, max_wait=url_params.max_wait_seconds,
|
||||
timeout=url_params.timeout_seconds, status_cb=LOG.warning,
|
||||
- headers_cb=self._get_headers, request_method=request_method)
|
||||
+ headers_redact=AWS_TOKEN_REDACT, headers_cb=self._get_headers,
|
||||
+ request_method=request_method)
|
||||
|
||||
if url:
|
||||
metadata_address = url2base[url]
|
||||
@@ -420,6 +427,7 @@ class DataSourceEc2(sources.DataSource):
|
||||
if not self.wait_for_metadata_service():
|
||||
return {}
|
||||
api_version = self.get_metadata_api_version()
|
||||
+ redact = AWS_TOKEN_REDACT
|
||||
crawled_metadata = {}
|
||||
if self.cloud_name == CloudNames.AWS:
|
||||
exc_cb = self._refresh_stale_aws_token_cb
|
||||
@@ -429,14 +437,17 @@ class DataSourceEc2(sources.DataSource):
|
||||
try:
|
||||
crawled_metadata['user-data'] = ec2.get_instance_userdata(
|
||||
api_version, self.metadata_address,
|
||||
- headers_cb=self._get_headers, exception_cb=exc_cb_ud)
|
||||
+ headers_cb=self._get_headers, headers_redact=redact,
|
||||
+ exception_cb=exc_cb_ud)
|
||||
crawled_metadata['meta-data'] = ec2.get_instance_metadata(
|
||||
api_version, self.metadata_address,
|
||||
- headers_cb=self._get_headers, exception_cb=exc_cb)
|
||||
+ headers_cb=self._get_headers, headers_redact=redact,
|
||||
+ exception_cb=exc_cb)
|
||||
if self.cloud_name == CloudNames.AWS:
|
||||
identity = ec2.get_instance_identity(
|
||||
api_version, self.metadata_address,
|
||||
- headers_cb=self._get_headers, exception_cb=exc_cb)
|
||||
+ headers_cb=self._get_headers, headers_redact=redact,
|
||||
+ exception_cb=exc_cb)
|
||||
crawled_metadata['dynamic'] = {'instance-identity': identity}
|
||||
except Exception:
|
||||
util.logexc(
|
||||
@@ -455,11 +466,12 @@ class DataSourceEc2(sources.DataSource):
|
||||
if self.cloud_name != CloudNames.AWS:
|
||||
return None
|
||||
LOG.debug("Refreshing Ec2 metadata API token")
|
||||
- request_header = {'X-aws-ec2-metadata-token-ttl-seconds': seconds}
|
||||
+ request_header = {AWS_TOKEN_REQ_HEADER: seconds}
|
||||
token_url = '{}/{}'.format(self.metadata_address, API_TOKEN_ROUTE)
|
||||
try:
|
||||
- response = uhelp.readurl(
|
||||
- token_url, headers=request_header, request_method="PUT")
|
||||
+ response = uhelp.readurl(token_url, headers=request_header,
|
||||
+ headers_redact=AWS_TOKEN_REDACT,
|
||||
+ request_method="PUT")
|
||||
except uhelp.UrlError as e:
|
||||
LOG.warning(
|
||||
'Unable to get API token: %s raised exception %s',
|
||||
@@ -500,8 +512,7 @@ class DataSourceEc2(sources.DataSource):
|
||||
API_TOKEN_DISABLED):
|
||||
return {}
|
||||
# Request a 6 hour token if URL is API_TOKEN_ROUTE
|
||||
- request_token_header = {
|
||||
- 'X-aws-ec2-metadata-token-ttl-seconds': AWS_TOKEN_TTL_SECONDS}
|
||||
+ request_token_header = {AWS_TOKEN_REQ_HEADER: AWS_TOKEN_TTL_SECONDS}
|
||||
if API_TOKEN_ROUTE in url:
|
||||
return request_token_header
|
||||
if not self._api_token:
|
||||
@@ -511,7 +522,7 @@ class DataSourceEc2(sources.DataSource):
|
||||
self._api_token = self._refresh_api_token()
|
||||
if not self._api_token:
|
||||
return {}
|
||||
- return {'X-aws-ec2-metadata-token': self._api_token}
|
||||
+ return {AWS_TOKEN_PUT_HEADER: self._api_token}
|
||||
|
||||
|
||||
class DataSourceEc2Local(DataSourceEc2):
|
||||
diff --git a/cloudinit/url_helper.py b/cloudinit/url_helper.py
|
||||
index 1496a47..3e7de9f 100644
|
||||
--- a/cloudinit/url_helper.py
|
||||
+++ b/cloudinit/url_helper.py
|
||||
@@ -8,6 +8,7 @@
|
||||
#
|
||||
# This file is part of cloud-init. See LICENSE file for license information.
|
||||
|
||||
+import copy
|
||||
import json
|
||||
import os
|
||||
import requests
|
||||
@@ -41,6 +42,7 @@ else:
|
||||
SSL_ENABLED = False
|
||||
CONFIG_ENABLED = False # This was added in 0.7 (but taken out in >=1.0)
|
||||
_REQ_VER = None
|
||||
+REDACTED = 'REDACTED'
|
||||
try:
|
||||
from distutils.version import LooseVersion
|
||||
import pkg_resources
|
||||
@@ -199,9 +201,9 @@ def _get_ssl_args(url, ssl_details):
|
||||
|
||||
|
||||
def readurl(url, data=None, timeout=None, retries=0, sec_between=1,
|
||||
- headers=None, headers_cb=None, ssl_details=None,
|
||||
- check_status=True, allow_redirects=True, exception_cb=None,
|
||||
- session=None, infinite=False, log_req_resp=True,
|
||||
+ headers=None, headers_cb=None, headers_redact=None,
|
||||
+ ssl_details=None, check_status=True, allow_redirects=True,
|
||||
+ exception_cb=None, session=None, infinite=False, log_req_resp=True,
|
||||
request_method=None):
|
||||
"""Wrapper around requests.Session to read the url and retry if necessary
|
||||
|
||||
@@ -217,6 +219,7 @@ def readurl(url, data=None, timeout=None, retries=0, sec_between=1,
|
||||
:param headers: Optional dict of headers to send during request
|
||||
:param headers_cb: Optional callable returning a dict of values to send as
|
||||
headers during request
|
||||
+ :param headers_redact: Optional list of header names to redact from the log
|
||||
:param ssl_details: Optional dict providing key_file, ca_certs, and
|
||||
cert_file keys for use on in ssl connections.
|
||||
:param check_status: Optional boolean set True to raise when HTTPError
|
||||
@@ -243,6 +246,8 @@ def readurl(url, data=None, timeout=None, retries=0, sec_between=1,
|
||||
req_args['method'] = request_method
|
||||
if timeout is not None:
|
||||
req_args['timeout'] = max(float(timeout), 0)
|
||||
+ if headers_redact is None:
|
||||
+ headers_redact = []
|
||||
# It doesn't seem like config
|
||||
# was added in older library versions (or newer ones either), thus we
|
||||
# need to manually do the retries if it wasn't...
|
||||
@@ -287,6 +292,12 @@ def readurl(url, data=None, timeout=None, retries=0, sec_between=1,
|
||||
if k == 'data':
|
||||
continue
|
||||
filtered_req_args[k] = v
|
||||
+ if k == 'headers':
|
||||
+ for hkey, _hval in v.items():
|
||||
+ if hkey in headers_redact:
|
||||
+ filtered_req_args[k][hkey] = (
|
||||
+ copy.deepcopy(req_args[k][hkey]))
|
||||
+ filtered_req_args[k][hkey] = REDACTED
|
||||
try:
|
||||
|
||||
if log_req_resp:
|
||||
@@ -339,8 +350,8 @@ def readurl(url, data=None, timeout=None, retries=0, sec_between=1,
|
||||
return None # Should throw before this...
|
||||
|
||||
|
||||
-def wait_for_url(urls, max_wait=None, timeout=None,
|
||||
- status_cb=None, headers_cb=None, sleep_time=1,
|
||||
+def wait_for_url(urls, max_wait=None, timeout=None, status_cb=None,
|
||||
+ headers_cb=None, headers_redact=None, sleep_time=1,
|
||||
exception_cb=None, sleep_time_cb=None, request_method=None):
|
||||
"""
|
||||
urls: a list of urls to try
|
||||
@@ -352,6 +363,7 @@ def wait_for_url(urls, max_wait=None, timeout=None,
|
||||
status_cb: call method with string message when a url is not available
|
||||
headers_cb: call method with single argument of url to get headers
|
||||
for request.
|
||||
+ headers_redact: a list of header names to redact from the log
|
||||
exception_cb: call method with 2 arguments 'msg' (per status_cb) and
|
||||
'exception', the exception that occurred.
|
||||
sleep_time_cb: call method with 2 arguments (response, loop_n) that
|
||||
@@ -415,8 +427,9 @@ def wait_for_url(urls, max_wait=None, timeout=None,
|
||||
headers = {}
|
||||
|
||||
response = readurl(
|
||||
- url, headers=headers, timeout=timeout,
|
||||
- check_status=False, request_method=request_method)
|
||||
+ url, headers=headers, headers_redact=headers_redact,
|
||||
+ timeout=timeout, check_status=False,
|
||||
+ request_method=request_method)
|
||||
if not response.contents:
|
||||
reason = "empty response [%s]" % (response.code)
|
||||
url_exc = UrlError(ValueError(reason), code=response.code,
|
||||
diff --git a/tests/unittests/test_datasource/test_ec2.py b/tests/unittests/test_datasource/test_ec2.py
|
||||
index 34a089f..bd5bd4c 100644
|
||||
--- a/tests/unittests/test_datasource/test_ec2.py
|
||||
+++ b/tests/unittests/test_datasource/test_ec2.py
|
||||
@@ -429,6 +429,23 @@ class TestEc2(test_helpers.HttprettyTestCase):
|
||||
self.assertTrue(ds.get_data())
|
||||
self.assertFalse(ds.is_classic_instance())
|
||||
|
||||
+ def test_aws_token_redacted(self):
|
||||
+ """Verify that aws tokens are redacted when logged."""
|
||||
+ ds = self._setup_ds(
|
||||
+ platform_data=self.valid_platform_data,
|
||||
+ sys_cfg={'datasource': {'Ec2': {'strict_id': False}}},
|
||||
+ md={'md': DEFAULT_METADATA})
|
||||
+ self.assertTrue(ds.get_data())
|
||||
+ all_logs = self.logs.getvalue().splitlines()
|
||||
+ REDACT_TTL = "'X-aws-ec2-metadata-token-ttl-seconds': 'REDACTED'"
|
||||
+ REDACT_TOK = "'X-aws-ec2-metadata-token': 'REDACTED'"
|
||||
+ logs_with_redacted_ttl = [log for log in all_logs if REDACT_TTL in log]
|
||||
+ logs_with_redacted = [log for log in all_logs if REDACT_TOK in log]
|
||||
+ logs_with_token = [log for log in all_logs if 'API-TOKEN' in log]
|
||||
+ self.assertEqual(1, len(logs_with_redacted_ttl))
|
||||
+ self.assertEqual(79, len(logs_with_redacted))
|
||||
+ self.assertEqual(0, len(logs_with_token))
|
||||
+
|
||||
@mock.patch('cloudinit.net.dhcp.maybe_perform_dhcp_discovery')
|
||||
def test_valid_platform_with_strict_true(self, m_dhcp):
|
||||
"""Valid platform data should return true with strict_id true."""
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,128 +0,0 @@
|
|||
From dc9460f161efce6770f66bb95d60cea6d27df722 Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Thu, 25 Jun 2020 08:03:59 +0200
|
||||
Subject: [PATCH] ec2: only redact token request headers in logs, avoid
|
||||
altering request (#230)
|
||||
|
||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Message-id: <20200624112104.376-1-otubo@redhat.com>
|
||||
Patchwork-id: 97793
|
||||
O-Subject: [RHEL-8.3.0 cloud-init PATCH] ec2: only redact token request headers in logs, avoid altering request (#230)
|
||||
Bugzilla: 1822343
|
||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
||||
|
||||
From: Chad Smith <chad.smith@canonical.com>
|
||||
|
||||
commit fa1abfec27050a4fb71cad950a17e42f9b43b478
|
||||
Author: Chad Smith <chad.smith@canonical.com>
|
||||
Date: Tue Mar 3 15:23:33 2020 -0700
|
||||
|
||||
ec2: only redact token request headers in logs, avoid altering request (#230)
|
||||
|
||||
Our header redact logic was redacting both logged request headers and
|
||||
the actual source request. This results in DataSourceEc2 sending the
|
||||
invalid header "X-aws-ec2-metadata-token-ttl-seconds: REDACTED" which
|
||||
gets an HTTP status response of 400.
|
||||
|
||||
Cloud-init retries this failed token request for 2 minutes before
|
||||
falling back to IMDSv1.
|
||||
|
||||
LP: #1865882
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
cloudinit/tests/test_url_helper.py | 34 +++++++++++++++++++++++++++++++++-
|
||||
cloudinit/url_helper.py | 15 ++++++++-------
|
||||
2 files changed, 41 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/cloudinit/tests/test_url_helper.py b/cloudinit/tests/test_url_helper.py
|
||||
index 1674120..29b3937 100644
|
||||
--- a/cloudinit/tests/test_url_helper.py
|
||||
+++ b/cloudinit/tests/test_url_helper.py
|
||||
@@ -1,7 +1,8 @@
|
||||
# This file is part of cloud-init. See LICENSE file for license information.
|
||||
|
||||
from cloudinit.url_helper import (
|
||||
- NOT_FOUND, UrlError, oauth_headers, read_file_or_url, retry_on_url_exc)
|
||||
+ NOT_FOUND, UrlError, REDACTED, oauth_headers, read_file_or_url,
|
||||
+ retry_on_url_exc)
|
||||
from cloudinit.tests.helpers import CiTestCase, mock, skipIf
|
||||
from cloudinit import util
|
||||
from cloudinit import version
|
||||
@@ -50,6 +51,9 @@ class TestOAuthHeaders(CiTestCase):
|
||||
|
||||
|
||||
class TestReadFileOrUrl(CiTestCase):
|
||||
+
|
||||
+ with_logs = True
|
||||
+
|
||||
def test_read_file_or_url_str_from_file(self):
|
||||
"""Test that str(result.contents) on file is text version of contents.
|
||||
It should not be "b'data'", but just "'data'" """
|
||||
@@ -71,6 +75,34 @@ class TestReadFileOrUrl(CiTestCase):
|
||||
self.assertEqual(result.contents, data)
|
||||
self.assertEqual(str(result), data.decode('utf-8'))
|
||||
|
||||
+ @httpretty.activate
|
||||
+ def test_read_file_or_url_str_from_url_redacting_headers_from_logs(self):
|
||||
+ """Headers are redacted from logs but unredacted in requests."""
|
||||
+ url = 'http://hostname/path'
|
||||
+ headers = {'sensitive': 'sekret', 'server': 'blah'}
|
||||
+ httpretty.register_uri(httpretty.GET, url)
|
||||
+
|
||||
+ read_file_or_url(url, headers=headers, headers_redact=['sensitive'])
|
||||
+ logs = self.logs.getvalue()
|
||||
+ for k in headers.keys():
|
||||
+ self.assertEqual(headers[k], httpretty.last_request().headers[k])
|
||||
+ self.assertIn(REDACTED, logs)
|
||||
+ self.assertNotIn('sekret', logs)
|
||||
+
|
||||
+ @httpretty.activate
|
||||
+ def test_read_file_or_url_str_from_url_redacts_noheaders(self):
|
||||
+ """When no headers_redact, header values are in logs and requests."""
|
||||
+ url = 'http://hostname/path'
|
||||
+ headers = {'sensitive': 'sekret', 'server': 'blah'}
|
||||
+ httpretty.register_uri(httpretty.GET, url)
|
||||
+
|
||||
+ read_file_or_url(url, headers=headers)
|
||||
+ for k in headers.keys():
|
||||
+ self.assertEqual(headers[k], httpretty.last_request().headers[k])
|
||||
+ logs = self.logs.getvalue()
|
||||
+ self.assertNotIn(REDACTED, logs)
|
||||
+ self.assertIn('sekret', logs)
|
||||
+
|
||||
@mock.patch(M_PATH + 'readurl')
|
||||
def test_read_file_or_url_passes_params_to_readurl(self, m_readurl):
|
||||
"""read_file_or_url passes all params through to readurl."""
|
||||
diff --git a/cloudinit/url_helper.py b/cloudinit/url_helper.py
|
||||
index 3e7de9f..e6188ea 100644
|
||||
--- a/cloudinit/url_helper.py
|
||||
+++ b/cloudinit/url_helper.py
|
||||
@@ -291,13 +291,14 @@ def readurl(url, data=None, timeout=None, retries=0, sec_between=1,
|
||||
for (k, v) in req_args.items():
|
||||
if k == 'data':
|
||||
continue
|
||||
- filtered_req_args[k] = v
|
||||
- if k == 'headers':
|
||||
- for hkey, _hval in v.items():
|
||||
- if hkey in headers_redact:
|
||||
- filtered_req_args[k][hkey] = (
|
||||
- copy.deepcopy(req_args[k][hkey]))
|
||||
- filtered_req_args[k][hkey] = REDACTED
|
||||
+ if k == 'headers' and headers_redact:
|
||||
+ matched_headers = [k for k in headers_redact if v.get(k)]
|
||||
+ if matched_headers:
|
||||
+ filtered_req_args[k] = copy.deepcopy(v)
|
||||
+ for key in matched_headers:
|
||||
+ filtered_req_args[k][key] = REDACTED
|
||||
+ else:
|
||||
+ filtered_req_args[k] = v
|
||||
try:
|
||||
|
||||
if log_req_resp:
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -1,203 +0,0 @@
|
|||
From 3ee8f2f5dde1bb27e682c5985bffe6fb9f9e5e0b Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Thu, 5 Nov 2020 12:42:26 +0100
|
||||
Subject: [PATCH 5/5] net: fix rendering of 'static6' in network config (#77)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
RH-Author: Eduardo Terrell Ferrari Otubo (eterrell)
|
||||
RH-MergeRequest: 17: Explicit set IPV6_AUTOCONF and IPV6_FORCE_ACCEPT_RA on static6 (#634)
|
||||
RH-Commit: [2/2] 30eb756aceb37761d50c70eb4f684662a11afa3f (eterrell/cloud-init)
|
||||
RH-Bugzilla: 1894015
|
||||
|
||||
commit dacdd30080bd8183d1f1c1dc9dbcbc8448301529
|
||||
Author: Ryan Harper <ryan.harper@canonical.com>
|
||||
Date: Wed Jan 8 11:30:17 2020 -0600
|
||||
|
||||
net: fix rendering of 'static6' in network config (#77)
|
||||
|
||||
* net: fix rendering of 'static6' in network config
|
||||
|
||||
A V1 static6 network typo was misrendered in eni, it's not valid.
|
||||
It was ignored in sysconfig and netplan. This branch fixes eni,
|
||||
updates sysconfig, netplan to render it correctly and adds unittests
|
||||
for all cases.
|
||||
|
||||
Reported-by: Raphaël Enrici
|
||||
|
||||
LP: #1850988
|
||||
|
||||
* net: add comment about static6 type in subnet_is_ipv6
|
||||
|
||||
Co-authored-by: Chad Smith <blackboxsw@gmail.com>
|
||||
Co-authored-by: Daniel Watkins <daniel@daniel-watkins.co.uk>
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
---
|
||||
cloudinit/net/eni.py | 4 +-
|
||||
cloudinit/net/netplan.py | 2 +-
|
||||
cloudinit/net/network_state.py | 2 +-
|
||||
cloudinit/net/sysconfig.py | 4 +-
|
||||
tests/unittests/test_distros/test_netconfig.py | 55 +++++++++++++++++++++++++-
|
||||
5 files changed, 61 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/cloudinit/net/eni.py b/cloudinit/net/eni.py
|
||||
index 7077106..2f71456 100644
|
||||
--- a/cloudinit/net/eni.py
|
||||
+++ b/cloudinit/net/eni.py
|
||||
@@ -429,7 +429,9 @@ class Renderer(renderer.Renderer):
|
||||
iface['mode'] = 'auto'
|
||||
# Use stateless DHCPv6 (0=off, 1=on)
|
||||
iface['dhcp'] = '0'
|
||||
- elif subnet_is_ipv6(subnet) and subnet['type'] == 'static':
|
||||
+ elif subnet_is_ipv6(subnet):
|
||||
+ # mode might be static6, eni uses 'static'
|
||||
+ iface['mode'] = 'static'
|
||||
if accept_ra is not None:
|
||||
# Accept router advertisements (0=off, 1=on)
|
||||
iface['accept_ra'] = '1' if accept_ra else '0'
|
||||
diff --git a/cloudinit/net/netplan.py b/cloudinit/net/netplan.py
|
||||
index 14d3999..8985527 100644
|
||||
--- a/cloudinit/net/netplan.py
|
||||
+++ b/cloudinit/net/netplan.py
|
||||
@@ -98,7 +98,7 @@ def _extract_addresses(config, entry, ifname, features=None):
|
||||
entry.update({sn_type: True})
|
||||
elif sn_type in IPV6_DYNAMIC_TYPES:
|
||||
entry.update({'dhcp6': True})
|
||||
- elif sn_type in ['static']:
|
||||
+ elif sn_type in ['static', 'static6']:
|
||||
addr = "%s" % subnet.get('address')
|
||||
if 'prefix' in subnet:
|
||||
addr += "/%d" % subnet.get('prefix')
|
||||
diff --git a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py
|
||||
index 2525fc9..48e5b6e 100644
|
||||
--- a/cloudinit/net/network_state.py
|
||||
+++ b/cloudinit/net/network_state.py
|
||||
@@ -942,7 +942,7 @@ def subnet_is_ipv6(subnet):
|
||||
# 'static6', 'dhcp6', 'ipv6_dhcpv6-stateful', 'ipv6_dhcpv6-stateless' or
|
||||
# 'ipv6_slaac'
|
||||
if subnet['type'].endswith('6') or subnet['type'] in IPV6_DYNAMIC_TYPES:
|
||||
- # This is a request for DHCPv6.
|
||||
+ # This is a request either static6 type or DHCPv6.
|
||||
return True
|
||||
elif subnet['type'] == 'static' and is_ipv6_addr(subnet.get('address')):
|
||||
return True
|
||||
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
||||
index 4210544..1989d01 100644
|
||||
--- a/cloudinit/net/sysconfig.py
|
||||
+++ b/cloudinit/net/sysconfig.py
|
||||
@@ -378,7 +378,7 @@ class Renderer(renderer.Renderer):
|
||||
iface_cfg['IPV6_AUTOCONF'] = True
|
||||
elif subnet_type in ['dhcp4', 'dhcp']:
|
||||
iface_cfg['BOOTPROTO'] = 'dhcp'
|
||||
- elif subnet_type == 'static':
|
||||
+ elif subnet_type in ['static', 'static6']:
|
||||
# grep BOOTPROTO sysconfig.txt -A2 | head -3
|
||||
# BOOTPROTO=none|bootp|dhcp
|
||||
# 'bootp' or 'dhcp' cause a DHCP client
|
||||
@@ -434,7 +434,7 @@ class Renderer(renderer.Renderer):
|
||||
continue
|
||||
elif subnet_type in IPV6_DYNAMIC_TYPES:
|
||||
continue
|
||||
- elif subnet_type == 'static':
|
||||
+ elif subnet_type in ['static', 'static6']:
|
||||
if subnet_is_ipv6(subnet):
|
||||
ipv6_index = ipv6_index + 1
|
||||
ipv6_cidr = "%s/%s" % (subnet['address'], subnet['prefix'])
|
||||
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
|
||||
index b85a333..e277bca 100644
|
||||
--- a/tests/unittests/test_distros/test_netconfig.py
|
||||
+++ b/tests/unittests/test_distros/test_netconfig.py
|
||||
@@ -109,13 +109,31 @@ auto eth1
|
||||
iface eth1 inet dhcp
|
||||
"""
|
||||
|
||||
+V1_NET_CFG_IPV6_OUTPUT = """\
|
||||
+# This file is generated from information provided by the datasource. Changes
|
||||
+# to it will not persist across an instance reboot. To disable cloud-init's
|
||||
+# network configuration capabilities, write a file
|
||||
+# /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg with the following:
|
||||
+# network: {config: disabled}
|
||||
+auto lo
|
||||
+iface lo inet loopback
|
||||
+
|
||||
+auto eth0
|
||||
+iface eth0 inet6 static
|
||||
+ address 2607:f0d0:1002:0011::2/64
|
||||
+ gateway 2607:f0d0:1002:0011::1
|
||||
+
|
||||
+auto eth1
|
||||
+iface eth1 inet dhcp
|
||||
+"""
|
||||
+
|
||||
V1_NET_CFG_IPV6 = {'config': [{'name': 'eth0',
|
||||
'subnets': [{'address':
|
||||
'2607:f0d0:1002:0011::2',
|
||||
'gateway':
|
||||
'2607:f0d0:1002:0011::1',
|
||||
'netmask': '64',
|
||||
- 'type': 'static'}],
|
||||
+ 'type': 'static6'}],
|
||||
'type': 'physical'},
|
||||
{'name': 'eth1',
|
||||
'subnets': [{'control': 'auto',
|
||||
@@ -141,6 +159,23 @@ network:
|
||||
dhcp4: true
|
||||
"""
|
||||
|
||||
+V1_TO_V2_NET_CFG_IPV6_OUTPUT = """\
|
||||
+# This file is generated from information provided by the datasource. Changes
|
||||
+# to it will not persist across an instance reboot. To disable cloud-init's
|
||||
+# network configuration capabilities, write a file
|
||||
+# /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg with the following:
|
||||
+# network: {config: disabled}
|
||||
+network:
|
||||
+ version: 2
|
||||
+ ethernets:
|
||||
+ eth0:
|
||||
+ addresses:
|
||||
+ - 2607:f0d0:1002:0011::2/64
|
||||
+ gateway6: 2607:f0d0:1002:0011::1
|
||||
+ eth1:
|
||||
+ dhcp4: true
|
||||
+"""
|
||||
+
|
||||
V2_NET_CFG = {
|
||||
'ethernets': {
|
||||
'eth7': {
|
||||
@@ -376,6 +411,14 @@ class TestNetCfgDistroUbuntuEni(TestNetCfgDistroBase):
|
||||
V1_NET_CFG,
|
||||
expected_cfgs=expected_cfgs.copy())
|
||||
|
||||
+ def test_apply_network_config_ipv6_ub(self):
|
||||
+ expected_cfgs = {
|
||||
+ self.eni_path(): V1_NET_CFG_IPV6_OUTPUT
|
||||
+ }
|
||||
+ self._apply_and_verify_eni(self.distro.apply_network_config,
|
||||
+ V1_NET_CFG_IPV6,
|
||||
+ expected_cfgs=expected_cfgs.copy())
|
||||
+
|
||||
|
||||
class TestNetCfgDistroUbuntuNetplan(TestNetCfgDistroBase):
|
||||
def setUp(self):
|
||||
@@ -419,6 +462,16 @@ class TestNetCfgDistroUbuntuNetplan(TestNetCfgDistroBase):
|
||||
V1_NET_CFG,
|
||||
expected_cfgs=expected_cfgs.copy())
|
||||
|
||||
+ def test_apply_network_config_v1_ipv6_to_netplan_ub(self):
|
||||
+ expected_cfgs = {
|
||||
+ self.netplan_path(): V1_TO_V2_NET_CFG_IPV6_OUTPUT,
|
||||
+ }
|
||||
+
|
||||
+ # ub_distro.apply_network_config(V1_NET_CFG_IPV6, False)
|
||||
+ self._apply_and_verify_netplan(self.distro.apply_network_config,
|
||||
+ V1_NET_CFG_IPV6,
|
||||
+ expected_cfgs=expected_cfgs.copy())
|
||||
+
|
||||
def test_apply_network_config_v2_passthrough_ub(self):
|
||||
expected_cfgs = {
|
||||
self.netplan_path(): V2_TO_V2_NET_CFG_OUTPUT,
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -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,254 +0,0 @@
|
|||
From 2f9d58439c94fe00cee951c213f14ace6da73691 Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Tue, 15 Sep 2020 18:00:00 +0200
|
||||
Subject: [PATCH 2/5] network: Fix type and respect name when rendering vlan in
|
||||
sysconfig. (#541)
|
||||
|
||||
RH-Author: Eduardo Terrell Ferrari Otubo (eterrell)
|
||||
RH-MergeRequest: 10: ifup bond0.504 Error: Connection activation failed: No suitable device found for this connection [rhel-8.3.0.z]
|
||||
RH-Commit: [1/1] fe8bd8bc184d2391b3f9ac6af80e231649d6019a (eterrell/cloud-init)
|
||||
RH-Bugzilla: 1890551
|
||||
|
||||
commit 8439b191ec2f336d544cab86dba2860f969cd5b8
|
||||
Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Tue Sep 15 18:00:00 2020 +0200
|
||||
|
||||
network: Fix type and respect name when rendering vlan in sysconfig. (#541)
|
||||
|
||||
Prior to this change, vlans were rendered in sysconfig with
|
||||
'TYPE=Ethernet', and incorrectly rendered the PHYSDEV based on
|
||||
the name of the vlan device rather than the 'link' provided
|
||||
in the network config.
|
||||
|
||||
The change here fixes:
|
||||
* rendering of TYPE=Ethernet for a vlan
|
||||
* adds a warning if the configured device name is not supported
|
||||
per the RHEL 7 docs "11.5. Naming Scheme for VLAN Interfaces"
|
||||
|
||||
LP: #1788915
|
||||
LP: #1826608
|
||||
RHBZ: #1861871
|
||||
|
||||
Conflicts:
|
||||
* A hunk on cloudinit/net/sysconfig.py could not apply cleanly as it
|
||||
depends on a verification on the distro flavor, which is not implemented
|
||||
on cloud-init-19.4.
|
||||
* Couple of hunks could not apply cleanly on tests/unittests/test_net.py
|
||||
because the definition of unit test response moved a little bit.
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
---
|
||||
cloudinit/net/sysconfig.py | 32 +++++++++-
|
||||
tests/unittests/test_distros/test_netconfig.py | 81 ++++++++++++++++++++++++++
|
||||
tests/unittests/test_net.py | 4 --
|
||||
3 files changed, 112 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
||||
index 810b283..4b4ed09 100644
|
||||
--- a/cloudinit/net/sysconfig.py
|
||||
+++ b/cloudinit/net/sysconfig.py
|
||||
@@ -95,6 +95,10 @@ class ConfigMap(object):
|
||||
def __len__(self):
|
||||
return len(self._conf)
|
||||
|
||||
+ def skip_key_value(self, key, val):
|
||||
+ """Skip the pair key, value if it matches a certain rule."""
|
||||
+ return False
|
||||
+
|
||||
def to_string(self):
|
||||
buf = six.StringIO()
|
||||
buf.write(_make_header())
|
||||
@@ -102,6 +106,8 @@ class ConfigMap(object):
|
||||
buf.write("\n")
|
||||
for key in sorted(self._conf.keys()):
|
||||
value = self._conf[key]
|
||||
+ if self.skip_key_value(key, value):
|
||||
+ continue
|
||||
if isinstance(value, bool):
|
||||
value = self._bool_map[value]
|
||||
if not isinstance(value, six.string_types):
|
||||
@@ -207,6 +213,7 @@ class NetInterface(ConfigMap):
|
||||
'bond': 'Bond',
|
||||
'bridge': 'Bridge',
|
||||
'infiniband': 'InfiniBand',
|
||||
+ 'vlan': 'Vlan',
|
||||
}
|
||||
|
||||
def __init__(self, iface_name, base_sysconf_dir, templates,
|
||||
@@ -260,6 +267,11 @@ class NetInterface(ConfigMap):
|
||||
c.routes = self.routes.copy()
|
||||
return c
|
||||
|
||||
+ def skip_key_value(self, key, val):
|
||||
+ if key == 'TYPE' and val == 'Vlan':
|
||||
+ return True
|
||||
+ return False
|
||||
+
|
||||
|
||||
class Renderer(renderer.Renderer):
|
||||
"""Renders network information in a /etc/sysconfig format."""
|
||||
@@ -599,7 +611,16 @@ class Renderer(renderer.Renderer):
|
||||
iface_name = iface['name']
|
||||
iface_cfg = iface_contents[iface_name]
|
||||
iface_cfg['VLAN'] = True
|
||||
- iface_cfg['PHYSDEV'] = iface_name[:iface_name.rfind('.')]
|
||||
+ iface_cfg.kind = 'vlan'
|
||||
+
|
||||
+ rdev = iface['vlan-raw-device']
|
||||
+ supported = _supported_vlan_names(rdev, iface['vlan_id'])
|
||||
+ if iface_name not in supported:
|
||||
+ LOG.info(
|
||||
+ "Name '%s' for vlan '%s' is not officially supported"
|
||||
+ "by RHEL. Supported: %s",
|
||||
+ iface_name, rdev, ' '.join(supported))
|
||||
+ iface_cfg['PHYSDEV'] = rdev
|
||||
|
||||
iface_subnets = iface.get("subnets", [])
|
||||
route_cfg = iface_cfg.routes
|
||||
@@ -771,6 +792,15 @@ class Renderer(renderer.Renderer):
|
||||
"\n".join(netcfg) + "\n", file_mode)
|
||||
|
||||
|
||||
+def _supported_vlan_names(rdev, vid):
|
||||
+ """Return list of supported names for vlan devices per RHEL doc
|
||||
+ 11.5. Naming Scheme for VLAN Interfaces."""
|
||||
+ return [
|
||||
+ v.format(rdev=rdev, vid=int(vid))
|
||||
+ for v in ("{rdev}{vid:04}", "{rdev}{vid}",
|
||||
+ "{rdev}.{vid:04}", "{rdev}.{vid}")]
|
||||
+
|
||||
+
|
||||
def available(target=None):
|
||||
sysconfig = available_sysconfig(target=target)
|
||||
nm = available_nm(target=target)
|
||||
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
|
||||
index 6720995..4ea4203 100644
|
||||
--- a/tests/unittests/test_distros/test_netconfig.py
|
||||
+++ b/tests/unittests/test_distros/test_netconfig.py
|
||||
@@ -526,6 +526,87 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
|
||||
V1_NET_CFG_IPV6,
|
||||
expected_cfgs=expected_cfgs.copy())
|
||||
|
||||
+ def test_vlan_render_unsupported(self):
|
||||
+ """Render officially unsupported vlan names."""
|
||||
+ cfg = {
|
||||
+ 'version': 2,
|
||||
+ 'ethernets': {
|
||||
+ 'eth0': {'addresses': ["192.10.1.2/24"],
|
||||
+ 'match': {'macaddress': "00:16:3e:60:7c:df"}}},
|
||||
+ 'vlans': {
|
||||
+ 'infra0': {'addresses': ["10.0.1.2/16"],
|
||||
+ 'id': 1001, 'link': 'eth0'}},
|
||||
+ }
|
||||
+ expected_cfgs = {
|
||||
+ self.ifcfg_path('eth0'): dedent("""\
|
||||
+ BOOTPROTO=none
|
||||
+ DEVICE=eth0
|
||||
+ 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
|
||||
+ """),
|
||||
+ self.ifcfg_path('infra0'): dedent("""\
|
||||
+ BOOTPROTO=none
|
||||
+ DEVICE=infra0
|
||||
+ IPADDR=10.0.1.2
|
||||
+ NETMASK=255.255.0.0
|
||||
+ NM_CONTROLLED=no
|
||||
+ ONBOOT=yes
|
||||
+ PHYSDEV=eth0
|
||||
+ USERCTL=no
|
||||
+ VLAN=yes
|
||||
+ """),
|
||||
+ self.control_path(): dedent("""\
|
||||
+ NETWORKING=yes
|
||||
+ """),
|
||||
+ }
|
||||
+ self._apply_and_verify(
|
||||
+ self.distro.apply_network_config, cfg,
|
||||
+ expected_cfgs=expected_cfgs)
|
||||
+
|
||||
+ def test_vlan_render(self):
|
||||
+ cfg = {
|
||||
+ 'version': 2,
|
||||
+ 'ethernets': {
|
||||
+ 'eth0': {'addresses': ["192.10.1.2/24"]}},
|
||||
+ 'vlans': {
|
||||
+ 'eth0.1001': {'addresses': ["10.0.1.2/16"],
|
||||
+ 'id': 1001, 'link': 'eth0'}},
|
||||
+ }
|
||||
+ expected_cfgs = {
|
||||
+ self.ifcfg_path('eth0'): dedent("""\
|
||||
+ BOOTPROTO=none
|
||||
+ DEVICE=eth0
|
||||
+ IPADDR=192.10.1.2
|
||||
+ NETMASK=255.255.255.0
|
||||
+ NM_CONTROLLED=no
|
||||
+ ONBOOT=yes
|
||||
+ TYPE=Ethernet
|
||||
+ USERCTL=no
|
||||
+ """),
|
||||
+ self.ifcfg_path('eth0.1001'): dedent("""\
|
||||
+ BOOTPROTO=none
|
||||
+ DEVICE=eth0.1001
|
||||
+ IPADDR=10.0.1.2
|
||||
+ NETMASK=255.255.0.0
|
||||
+ NM_CONTROLLED=no
|
||||
+ ONBOOT=yes
|
||||
+ PHYSDEV=eth0
|
||||
+ USERCTL=no
|
||||
+ VLAN=yes
|
||||
+ """),
|
||||
+ self.control_path(): dedent("""\
|
||||
+ NETWORKING=yes
|
||||
+ """),
|
||||
+ }
|
||||
+ self._apply_and_verify(
|
||||
+ self.distro.apply_network_config, cfg,
|
||||
+ expected_cfgs=expected_cfgs)
|
||||
+
|
||||
|
||||
class TestNetCfgDistroOpensuse(TestNetCfgDistroBase):
|
||||
|
||||
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
||||
index a931a3e..2eedb12 100644
|
||||
--- a/tests/unittests/test_net.py
|
||||
+++ b/tests/unittests/test_net.py
|
||||
@@ -1496,7 +1496,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
||||
ONBOOT=yes
|
||||
PHYSDEV=bond0
|
||||
STARTMODE=auto
|
||||
- TYPE=Ethernet
|
||||
USERCTL=no
|
||||
VLAN=yes"""),
|
||||
'ifcfg-br0': textwrap.dedent("""\
|
||||
@@ -1541,7 +1540,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
||||
ONBOOT=yes
|
||||
PHYSDEV=eth0
|
||||
STARTMODE=auto
|
||||
- TYPE=Ethernet
|
||||
USERCTL=no
|
||||
VLAN=yes"""),
|
||||
'ifcfg-eth1': textwrap.dedent("""\
|
||||
@@ -2163,7 +2161,6 @@ iface bond0 inet6 static
|
||||
ONBOOT=yes
|
||||
PHYSDEV=en0
|
||||
STARTMODE=auto
|
||||
- TYPE=Ethernet
|
||||
USERCTL=no
|
||||
VLAN=yes"""),
|
||||
},
|
||||
@@ -3180,7 +3177,6 @@ USERCTL=no
|
||||
ONBOOT=yes
|
||||
PHYSDEV=eno1
|
||||
STARTMODE=auto
|
||||
- TYPE=Ethernet
|
||||
USERCTL=no
|
||||
VLAN=yes
|
||||
""")
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
From 44b6004ee17cd2ae5930c7d8fd3ecafd7485a4d6 Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Mon, 17 Aug 2020 11:14:47 +0200
|
||||
Subject: [PATCH 2/2] ssh exit with non-zero status on disabled user (#472)
|
||||
|
||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Message-id: <20200729074459.16096-1-otubo@redhat.com>
|
||||
Patchwork-id: 98071
|
||||
O-Subject: [RHEL-8.3.0 cloud-init PATCH] ssh exit with non-zero status on disabled user (#472)
|
||||
Bugzilla: 1833874
|
||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
|
||||
commit e161059a18173e2b61c54dba9eab774401fb5f1f
|
||||
Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Wed Jul 15 20:21:02 2020 +0200
|
||||
|
||||
ssh exit with non-zero status on disabled user (#472)
|
||||
|
||||
It is confusing for scripts, where a disabled user has been specified,
|
||||
that ssh exits with a zero status by default without indication anything
|
||||
failed.
|
||||
|
||||
I think exitting with a non-zero status would make more clear in scripts
|
||||
and automated setups where things failed, thus making noticing the issue
|
||||
and debugging easier.
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
Signed-off-by: Aleksandar Kostadinov <akostadi@redhat.com>
|
||||
|
||||
LP: #1170059
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
cloudinit/ssh_util.py | 4 +++-
|
||||
doc/examples/cloud-config.txt | 2 +-
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py
|
||||
index bcb23a5..8ff61a2 100644
|
||||
--- a/cloudinit/ssh_util.py
|
||||
+++ b/cloudinit/ssh_util.py
|
||||
@@ -40,11 +40,13 @@ VALID_KEY_TYPES = (
|
||||
"ssh-rsa-cert-v01@openssh.com",
|
||||
)
|
||||
|
||||
+_DISABLE_USER_SSH_EXIT = 142
|
||||
|
||||
DISABLE_USER_OPTS = (
|
||||
"no-port-forwarding,no-agent-forwarding,"
|
||||
"no-X11-forwarding,command=\"echo \'Please login as the user \\\"$USER\\\""
|
||||
- " rather than the user \\\"$DISABLE_USER\\\".\';echo;sleep 10\"")
|
||||
+ " rather than the user \\\"$DISABLE_USER\\\".\';echo;sleep 10;"
|
||||
+ "exit " + str(_DISABLE_USER_SSH_EXIT) + "\"")
|
||||
|
||||
|
||||
class AuthKeyLine(object):
|
||||
diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt
|
||||
index 0e82b83..f00db68 100644
|
||||
--- a/doc/examples/cloud-config.txt
|
||||
+++ b/doc/examples/cloud-config.txt
|
||||
@@ -235,7 +235,7 @@ disable_root: false
|
||||
# The string '$USER' will be replaced with the username of the default user.
|
||||
# The string '$DISABLE_USER' will be replaced with the username to disable.
|
||||
#
|
||||
-# disable_root_opts: no-port-forwarding,no-agent-forwarding,no-X11-forwarding,command="echo 'Please login as the user \"$USER\" rather than the user \"$DISABLE_USER\".';echo;sleep 10"
|
||||
+# disable_root_opts: no-port-forwarding,no-agent-forwarding,no-X11-forwarding,command="echo 'Please login as the user \"$USER\" rather than the user \"$DISABLE_USER\".';echo;sleep 10;exit 142"
|
||||
|
||||
# disable ssh access for non-root-users
|
||||
# To disable ssh access for non-root users, ssh_redirect_user: true can be
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
From 4f177d3363a0efb2ee67b8a46efaca7707c2437f Mon Sep 17 00:00:00 2001
|
||||
From: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Mon, 24 Aug 2020 15:25:36 +0200
|
||||
Subject: [PATCH 2/3] swap file "size" being used before checked if str (#315)
|
||||
|
||||
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Message-id: <20200820092042.5418-3-otubo@redhat.com>
|
||||
Patchwork-id: 98192
|
||||
O-Subject: [RHEL-8.3.0 cloud-init PATCH 2/3] swap file "size" being used before checked if str (#315)
|
||||
Bugzilla: 1794664
|
||||
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
|
||||
commit 46cf23c28812d3e3ba0c570defd9a05628af5556
|
||||
Author: Eduardo Otubo <otubo@redhat.com>
|
||||
Date: Tue Apr 14 17:45:14 2020 +0200
|
||||
|
||||
swap file "size" being used before checked if str
|
||||
|
||||
Swap file size variable was being used before checked if it's set to str
|
||||
"auto". If set to "auto", it will break with:
|
||||
|
||||
failed to setup swap: unsupported operand type(s) for /: 'str' and 'int'
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
|
||||
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
cloudinit/config/cc_mounts.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py
|
||||
index 4293844..0573026 100644
|
||||
--- a/cloudinit/config/cc_mounts.py
|
||||
+++ b/cloudinit/config/cc_mounts.py
|
||||
@@ -274,7 +274,6 @@ def setup_swapfile(fname, size=None, maxsize=None):
|
||||
maxsize: the maximum size
|
||||
"""
|
||||
swap_dir = os.path.dirname(fname)
|
||||
- mibsize = str(int(size / (2 ** 20)))
|
||||
if str(size).lower() == "auto":
|
||||
try:
|
||||
memsize = util.read_meminfo()['total']
|
||||
@@ -286,6 +285,7 @@ def setup_swapfile(fname, size=None, maxsize=None):
|
||||
size = suggested_swapsize(fsys=swap_dir, maxsize=maxsize,
|
||||
memsize=memsize)
|
||||
|
||||
+ mibsize = str(int(size / (2 ** 20)))
|
||||
if not size:
|
||||
LOG.debug("Not creating swap: suggested size was 0")
|
||||
return
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -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
|
||||
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
From ebbc83c1ca52620179d94dc1d92c44883273e4ef Mon Sep 17 00:00:00 2001
|
||||
From: jmaloy <jmaloy@redhat.com>
|
||||
Date: Thu, 28 May 2020 08:44:02 +0200
|
||||
Subject: [PATCH 2/4] utils: use SystemRandom when generating random password.
|
||||
(#204)
|
||||
|
||||
RH-Author: jmaloy <jmaloy@redhat.com>
|
||||
Message-id: <20200313184329.16696-2-jmaloy@redhat.com>
|
||||
Patchwork-id: 94294
|
||||
O-Subject: [RHEL-8.2 cloud-init PATCH 1/1] utils: use SystemRandom when generating random password. (#204)
|
||||
Bugzilla: 1812174
|
||||
RH-Acked-by: Eduardo Otubo <eterrell@redhat.com>
|
||||
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
||||
|
||||
From: Dimitri John Ledkov <xnox@ubuntu.com>
|
||||
|
||||
As noticed by Seth Arnold, non-deterministic SystemRandom should be
|
||||
used when creating security sensitive random strings.
|
||||
|
||||
(cherry picked from commit 3e2f7356effc9e9cccc5ae945846279804eedc46)
|
||||
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||
---
|
||||
cloudinit/util.py | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cloudinit/util.py b/cloudinit/util.py
|
||||
index 9d9d5c7..5d51ba8 100644
|
||||
--- a/cloudinit/util.py
|
||||
+++ b/cloudinit/util.py
|
||||
@@ -401,9 +401,10 @@ def translate_bool(val, addons=None):
|
||||
|
||||
|
||||
def rand_str(strlen=32, select_from=None):
|
||||
+ r = random.SystemRandom()
|
||||
if not select_from:
|
||||
select_from = string.ascii_letters + string.digits
|
||||
- return "".join([random.choice(select_from) for _x in range(0, strlen)])
|
||||
+ return "".join([r.choice(select_from) for _x in range(0, strlen)])
|
||||
|
||||
|
||||
def rand_dict_key(dictionary, postfix=None):
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -5,69 +5,40 @@
|
|||
%global debug_package %{nil}
|
||||
|
||||
Name: cloud-init
|
||||
Version: 19.4
|
||||
Release: 11%{?dist}.3
|
||||
Version: 23.4
|
||||
Release: 7%{?dist}
|
||||
Summary: Cloud instance init scripts
|
||||
|
||||
Group: System Environment/Base
|
||||
License: GPLv3
|
||||
URL: http://launchpad.net/cloud-init
|
||||
Source0: https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz
|
||||
URL: https://github.com/canonical/cloud-init
|
||||
Source0: https://github.com/canonical/cloud-init/archive/refs/tags/%{version}.tar.gz
|
||||
Source1: cloud-init-tmpfiles.conf
|
||||
|
||||
Patch0001: 0001-Add-initial-redhat-setup.patch
|
||||
Patch0002: 0002-Do-not-write-NM_CONTROLLED-no-in-generated-interface.patch
|
||||
Patch0003: 0003-limit-permissions-on-def_log_file.patch
|
||||
Patch0004: 0004-sysconfig-Don-t-write-BOOTPROTO-dhcp-for-ipv6-dhcp.patch
|
||||
Patch0005: 0005-DataSourceAzure.py-use-hostnamectl-to-set-hostname.patch
|
||||
Patch0006: 0006-include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
|
||||
Patch0007: 0007-Remove-race-condition-between-cloud-init-and-Network.patch
|
||||
# For bz#1812171 - CVE-2020-8632 cloud-init: Too short random password length in cc_set_password in config/cc_set_passwords.py [rhel-8]
|
||||
Patch8: ci-cc_set_password-increase-random-pwlength-from-9-to-2.patch
|
||||
# For bz#1812174 - CVE-2020-8631 cloud-init: Use of random.choice when generating random password [rhel-8]
|
||||
Patch9: ci-utils-use-SystemRandom-when-generating-random-passwo.patch
|
||||
# For bz#1814152 - CVE-2018-10896 cloud-init: default configuration disabled deletion of SSH host keys [rhel-8]
|
||||
Patch10: ci-Enable-ssh_deletekeys-by-default.patch
|
||||
# For bz#1840648 - [cloud-init][RHEL-8.2.0] /etc/resolv.conf lose config after reboot (initial instance is ok)
|
||||
Patch11: ci-Remove-race-condition-between-cloud-init-and-Network.patch
|
||||
# For bz#1803928 - [RHEL8.3] Race condition of starting cloud-init and NetworkManager
|
||||
Patch12: ci-Make-cloud-init.service-execute-after-network-is-up.patch
|
||||
# For bz#1822343 - [RHEL8.3] Do not log IMDSv2 token values into cloud-init.log
|
||||
Patch13: ci-ec2-Do-not-log-IMDSv2-token-values-instead-use-REDAC.patch
|
||||
# For bz#1834173 - [rhel-8.3]Incorrect ds-identify check in cloud-init-generator
|
||||
Patch14: ci-Change-from-redhat-to-rhel-in-systemd-generator-tmpl.patch
|
||||
# For bz#1834173 - [rhel-8.3]Incorrect ds-identify check in cloud-init-generator
|
||||
Patch15: ci-cloud-init.service.tmpl-use-rhel-instead-of-redhat-4.patch
|
||||
# For bz#1822343 - [RHEL8.3] Do not log IMDSv2 token values into cloud-init.log
|
||||
Patch16: ci-ec2-only-redact-token-request-headers-in-logs-avoid-.patch
|
||||
# For bz#1839662 - [ESXi][RHEL8.3][cloud-init]ERROR log in cloud-init.log after clone VM on ESXi platform
|
||||
Patch17: ci-When-tools.conf-does-not-exist-running-cmd-vmware-to.patch
|
||||
# For bz#1833874 - [rhel-8.3]using root user error should cause a non-zero exit code
|
||||
Patch18: ci-ssh-exit-with-non-zero-status-on-disabled-user-472.patch
|
||||
# For bz#1794664 - [RHEL8] swapon fails with "swapfile has holes" when created on a xfs filesystem by cloud-init
|
||||
Patch19: ci-Do-not-use-fallocate-in-swap-file-creation-on-xfs.-7.patch
|
||||
# For bz#1794664 - [RHEL8] swapon fails with "swapfile has holes" when created on a xfs filesystem by cloud-init
|
||||
Patch20: ci-swap-file-size-being-used-before-checked-if-str-315.patch
|
||||
# For bz#1794664 - [RHEL8] swapon fails with "swapfile has holes" when created on a xfs filesystem by cloud-init
|
||||
Patch21: ci-Detect-kernel-version-before-swap-file-creation-428.patch
|
||||
# For bz#1839662 - [ESXi][RHEL8.3][cloud-init]ERROR log in cloud-init.log after clone VM on ESXi platform
|
||||
Patch22: ci-Changing-notation-of-subp-call.patch
|
||||
# For bz#1794664 - [RHEL8] swapon fails with "swapfile has holes" when created on a xfs filesystem by cloud-init
|
||||
Patch23: ci-cc_mounts-fix-incorrect-format-specifiers-316.patch
|
||||
# For bz#1879989 - [Azure][RHEL 8] cloud-init Permission denied with the use of mount option noexec [rhel-8.3.0.z]
|
||||
Patch24: ci-DHCP-sandboxing-failing-on-noexec-mounted-var-tmp-52.patch
|
||||
# For bz#1890551 - [rhel8][cloud-init] ifup bond0.504 Error: Connection activation failed: No suitable device found for this connection [rhel-8.3.0.z]
|
||||
Patch25: ci-network-Fix-type-and-respect-name-when-rendering-vla.patch
|
||||
# For bz#1894014 - Support for cloud-init config modules for PowerVM Hypervisor in Red Hat cloud-init [rhel-8.3.0.z]
|
||||
Patch26: ci-Add-config-modules-for-controlling-IBM-PowerVM-RMC.-.patch
|
||||
# For bz#1894015 - Add support for ipv6_autoconf[rhel-8.3.0.z]
|
||||
Patch27: ci-Explicit-set-IPV6_AUTOCONF-and-IPV6_FORCE_ACCEPT_RA-.patch
|
||||
# For bz#1894015 - Add support for ipv6_autoconf[rhel-8.3.0.z]
|
||||
Patch28: ci-net-fix-rendering-of-static6-in-network-config-77.patch
|
||||
# For bz#1916839 - [Azure] Update existing user password RHEL8x [rhel-8.3.0.z]
|
||||
Patch29: ci-DataSourceAzure-update-password-for-defuser-if-exist.patch
|
||||
# For bz#1931835 - SUSE specific option, STARTMODE, should not exist in ifcfg-XXX file. [rhel-8.3.0.z]
|
||||
Patch30: ci-sysconfig-distro-specific-config-rendering-for-BOOTP.patch
|
||||
Patch0003: 0003-Do-not-write-NM_CONTROLLED-no-in-generated-interface.patch
|
||||
Patch0004: 0004-include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
|
||||
Patch0005: 0005-settings.py-update-settings-for-rhel.patch
|
||||
Patch0013: 0013-rhel-cloud.cfg-remove-ssh_genkeytypes-in-settings.py.patch
|
||||
# For RHEL-7277 - [RFE] [Azure][RHEL8][Network][cloud-init] Can not acquire IPv6 address
|
||||
Patch14: ci-net-network_manager-do-not-set-may-fail-to-False-for.patch
|
||||
# For RHEL-7277 - [RFE] [Azure][RHEL8][Network][cloud-init] Can not acquire IPv6 address
|
||||
Patch15: ci-net-allow-dhcp6-configuration-from-generate_fallback.patch
|
||||
# For RHEL-17610 - [RHEL-8] NetworkManagerActivator brings up interface failed when using sysconfig renderer
|
||||
Patch16: ci-net-nm-check-for-presence-of-ifcfg-files-when-nm-con.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
|
||||
|
||||
|
|
@ -100,7 +71,6 @@ BuildRequires: /usr/bin/dnf
|
|||
Requires: e2fsprogs
|
||||
Requires: iproute
|
||||
Requires: libselinux-python3
|
||||
Requires: net-tools
|
||||
Requires: policycoreutils-python3
|
||||
Requires: procps
|
||||
Requires: python3-configobj
|
||||
|
|
@ -116,6 +86,11 @@ Requires: python3-six
|
|||
Requires: shadow-utils
|
||||
Requires: util-linux
|
||||
Requires: xfsprogs
|
||||
Requires: dhcp-client
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2039697
|
||||
Requires: gdisk
|
||||
Requires: openssl
|
||||
Requires: python3-netifaces
|
||||
|
||||
%{?systemd_requires}
|
||||
|
||||
|
|
@ -139,7 +114,7 @@ sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \
|
|||
%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
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/var/lib/cloud
|
||||
|
||||
|
|
@ -148,27 +123,20 @@ mkdir -p $RPM_BUILD_ROOT/run/cloud-init
|
|||
mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
|
||||
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
|
||||
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
|
||||
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
|
||||
|
||||
[ ! -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
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1/
|
||||
for man in cloud-id.1 cloud-init.1 cloud-init-per.1; do
|
||||
install -c -m 0644 doc/man/${man} ${RPM_BUILD_ROOT}%{_mandir}/man1/${man}
|
||||
chmod -x ${RPM_BUILD_ROOT}%{_mandir}/man1/*
|
||||
done
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
|
@ -184,7 +152,27 @@ if [ $1 -eq 1 ] ; then
|
|||
/bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || :
|
||||
/bin/systemctl enable cloud-init.target >/dev/null 2>&1 || :
|
||||
elif [ $1 -eq 2 ]; then
|
||||
# Upgrade. If the upgrade is from a version older than 0.7.9-8,
|
||||
# Upgrade
|
||||
# RHBZ 2210012 - check for null ssh_genkeytypes value in cloud.cfg that
|
||||
# breaks ssh connectivity after upgrade to a newer version of cloud-init.
|
||||
if [ -f %{_sysconfdir}/cloud/cloud.cfg.rpmnew ] && grep -q '^\s*ssh_genkeytypes:\s*~\s*$' %{_sysconfdir}/cloud/cloud.cfg ; then
|
||||
echo "***********************************************"
|
||||
echo "*** WARNING!!!! ***"
|
||||
echo ""
|
||||
echo "ssh_genkeytypes set to null in /etc/cloud/cloud.cfg!"
|
||||
echo "SSH access might be broken after reboot. Please check the following KCS"
|
||||
echo "for more detailed information:"
|
||||
echo ""
|
||||
echo "https://access.redhat.com/solutions/6988034"
|
||||
echo ""
|
||||
echo "Please reconcile the differences between /etc/cloud/cloud.cfg and "
|
||||
echo "/etc/cloud/cloud.cfg.rpmnew and update ssh_genkeytypes configuration in "
|
||||
echo "/etc/cloud/cloud.cfg to a list of keytype values, something like:"
|
||||
echo "ssh_genkeytypes: ['rsa', 'ecdsa', 'ed25519']"
|
||||
echo ""
|
||||
echo "************************************************"
|
||||
fi
|
||||
# If the upgrade is from a version older than 0.7.9-8,
|
||||
# there will be stale systemd config
|
||||
/bin/systemctl is-enabled cloud-config.service >/dev/null 2>&1 &&
|
||||
/bin/systemctl reenable cloud-config.service >/dev/null 2>&1 || :
|
||||
|
|
@ -214,12 +202,25 @@ if [ $1 -eq 0 ] ; then
|
|||
fi
|
||||
|
||||
%postun
|
||||
%systemd_postun
|
||||
%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
|
||||
%license LICENSE
|
||||
%doc ChangeLog rhel/README.rhel
|
||||
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg
|
||||
%dir %{_sysconfdir}/cloud/cloud.cfg.d
|
||||
%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg
|
||||
|
|
@ -229,6 +230,8 @@ fi
|
|||
%{_unitdir}/cloud-config.service
|
||||
%{_unitdir}/cloud-config.target
|
||||
%{_unitdir}/cloud-final.service
|
||||
%{_unitdir}/cloud-init-hotplugd.service
|
||||
%{_unitdir}/cloud-init-hotplugd.socket
|
||||
%{_unitdir}/cloud-init-local.service
|
||||
%{_unitdir}/cloud-init.service
|
||||
%{_unitdir}/cloud-init.target
|
||||
|
|
@ -237,44 +240,354 @@ fi
|
|||
%{_libexecdir}/%{name}
|
||||
%{_bindir}/cloud-init*
|
||||
%doc %{_datadir}/doc/%{name}
|
||||
%{_mandir}/man1/*
|
||||
%dir %verify(not mode) /run/cloud-init
|
||||
%dir /var/lib/cloud
|
||||
/etc/NetworkManager/dispatcher.d/cloud-init-azure-hook
|
||||
%{_udevrulesdir}/66-azure-ephemeral.rules
|
||||
%{_sysconfdir}/bash_completion.d/cloud-init
|
||||
%{_datadir}/bash-completion/completions/cloud-init
|
||||
%{_bindir}/cloud-id
|
||||
%{_libexecdir}/%{name}/ds-identify
|
||||
/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
|
||||
%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
|
||||
|
||||
%changelog
|
||||
* Wed Mar 10 2021 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-11.el8_3.3
|
||||
- ci-sysconfig-distro-specific-config-rendering-for-BOOTP.patch [bz#1931835]
|
||||
- Resolves: bz#1931835
|
||||
(SUSE specific option, STARTMODE, should not exist in ifcfg-XXX file. [rhel-8.3.0.z])
|
||||
* 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)
|
||||
|
||||
* Tue Jan 26 2021 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-11.el8_3.2
|
||||
- ci-DataSourceAzure-update-password-for-defuser-if-exist.patch [bz#1916839]
|
||||
- Resolves: bz#1916839
|
||||
([Azure] Update existing user password RHEL8x [rhel-8.3.0.z])
|
||||
* 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 Nov 09 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-11.el8_3.1
|
||||
- ci-DHCP-sandboxing-failing-on-noexec-mounted-var-tmp-52.patch [bz#1879989]
|
||||
- ci-network-Fix-type-and-respect-name-when-rendering-vla.patch [bz#1890551]
|
||||
- ci-Add-config-modules-for-controlling-IBM-PowerVM-RMC.-.patch [bz#1894014]
|
||||
- ci-Explicit-set-IPV6_AUTOCONF-and-IPV6_FORCE_ACCEPT_RA-.patch [bz#1894015]
|
||||
- ci-net-fix-rendering-of-static6-in-network-config-77.patch [bz#1894015]
|
||||
- Resolves: bz#1879989
|
||||
([Azure][RHEL 8] cloud-init Permission denied with the use of mount option noexec [rhel-8.3.0.z])
|
||||
- Resolves: bz#1890551
|
||||
([rhel8][cloud-init] ifup bond0.504 Error: Connection activation failed: No suitable device found for this connection [rhel-8.3.0.z])
|
||||
- Resolves: bz#1894014
|
||||
(Support for cloud-init config modules for PowerVM Hypervisor in Red Hat cloud-init [rhel-8.3.0.z])
|
||||
- Resolves: bz#1894015
|
||||
(Add support for ipv6_autoconf[rhel-8.3.0.z])
|
||||
* 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
|
||||
- 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]
|
||||
- Resolves: bz#1957532
|
||||
([cloud-init] From RHEL 82+ cloud-init no longer displays sshd keys fingerprints from instance launched from a backup image)
|
||||
- Resolves: bz#1952089
|
||||
(cloud-init brew build fails on Fedora 33)
|
||||
|
||||
* Thu May 27 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-1.el8
|
||||
- Rebaes to 21.1 [bz#1958174]
|
||||
- Resolves: bz#1958174
|
||||
([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
|
||||
- ci-fix-a-typo-in-man-page-cloud-init.1-752.patch [bz#1913127]
|
||||
- Resolves: bz#1913127
|
||||
(A typo in cloud-init man page)
|
||||
|
||||
* Tue Jan 26 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-9.el8
|
||||
- ci-DataSourceAzure-update-password-for-defuser-if-exist.patch [bz#1900892]
|
||||
- ci-Revert-ssh_util-handle-non-default-AuthorizedKeysFil.patch [bz#1919972]
|
||||
- Resolves: bz#1900892
|
||||
([Azure] Update existing user password RHEL8x)
|
||||
- Resolves: bz#1919972
|
||||
([RHEL-8.4] ssh keys can be shared across users giving potential root access)
|
||||
|
||||
* Thu Jan 21 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-8.el8
|
||||
- ci-Missing-IPV6_AUTOCONF-no-to-render-sysconfig-dhcp6-s.patch [bz#1859695]
|
||||
- Resolves: bz#1859695
|
||||
([Cloud-init] DHCPv6 assigned address is not added to VM's interface)
|
||||
|
||||
* Tue Jan 05 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-7.el8
|
||||
- ci-Report-full-specific-version-with-cloud-init-version.patch [bz#1898949]
|
||||
- Resolves: bz#1898949
|
||||
(cloud-init should report full specific full version with "cloud-init --version")
|
||||
|
||||
* Mon Dec 14 2020 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-6.el8
|
||||
- ci-Installing-man-pages-in-the-correct-place-with-corre.patch [bz#1612573]
|
||||
- ci-Adding-BOOTPROTO-dhcp-to-render-sysconfig-dhcp6-stat.patch [bz#1859695]
|
||||
- ci-Fix-unit-failure-of-cloud-final.service-if-NetworkMa.patch [bz#1898943]
|
||||
- ci-ssh_util-handle-non-default-AuthorizedKeysFile-confi.patch [bz#1862967]
|
||||
- Resolves: bz#1612573
|
||||
(Man page scan results for cloud-init)
|
||||
- Resolves: bz#1859695
|
||||
([Cloud-init] DHCPv6 assigned address is not added to VM's interface)
|
||||
- Resolves: bz#1898943
|
||||
([rhel-8]cloud-final.service fails if NetworkManager not installed.)
|
||||
- Resolves: bz#1862967
|
||||
([cloud-init]Customize ssh AuthorizedKeysFile causes login failure)
|
||||
|
||||
* Fri Nov 27 2020 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-5.el8
|
||||
- ci-network-Fix-type-and-respect-name-when-rendering-vla.patch [bz#1881462]
|
||||
- Resolves: bz#1881462
|
||||
([rhel8][cloud-init] ifup bond0.504 Error: Connection activation failed: No suitable device found for this connection)
|
||||
|
||||
* Tue Nov 24 2020 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-4.el8
|
||||
- ci-Changing-permission-of-cloud-init-generator-to-755.patch [bz#1897528]
|
||||
- Resolves: bz#1897528
|
||||
(Change permission on ./systemd/cloud-init-generator.tmpl to 755 instead of 771)
|
||||
|
||||
* Fri Nov 13 2020 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-3.el8
|
||||
- ci--Removing-net-tools-dependency.patch [bz#1881871]
|
||||
- ci--Adding-man-pages-to-Red-Hat-spec-file.patch [bz#1612573]
|
||||
- Resolves: bz#1881871
|
||||
(Remove net-tools legacy dependency from spec file)
|
||||
- Resolves: bz#1612573
|
||||
(Man page scan results for cloud-init)
|
||||
|
||||
* Tue Nov 03 2020 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-2.el8
|
||||
- ci-Explicit-set-IPV6_AUTOCONF-and-IPV6_FORCE_ACCEPT_RA-.patch [bz#1889635]
|
||||
- ci-Add-config-modules-for-controlling-IBM-PowerVM-RMC.-.patch [bz#1886430]
|
||||
- Resolves: bz#1886430
|
||||
(Support for cloud-init config modules for PowerVM Hypervisor in Red Hat cloud-init)
|
||||
- Resolves: bz#1889635
|
||||
(Add support for ipv6_autoconf on cloud-init-20.3)
|
||||
|
||||
* Fri Oct 23 2020 Eduardo Otubo <otubo@redhat.com> - 20.3-1.el8
|
||||
- Rebase to cloud-init 20.3 [bz#1885185]
|
||||
- Resolves: bz#1885185
|
||||
([RHEL-8.4.0] cloud-init rebase to 20.3)
|
||||
|
||||
* Wed Sep 02 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-11.el8
|
||||
- ci-cc_mounts-fix-incorrect-format-specifiers-316.patch [bz#1794664]
|
||||
|
|
@ -345,10 +658,10 @@ fi
|
|||
- Resolves: bz#1840648
|
||||
([cloud-init][RHEL-8.2.0] /etc/resolv.conf lose config after reboot (initial instance is ok))
|
||||
|
||||
* Mon Apr 20 2020 Miroslav Rezanina <mrezanin@redhat.coM> - 19.4-1.el8
|
||||
- Rebase to cloud-init 19.4 [bz#1803095]
|
||||
- Resolves: bz#1803095
|
||||
([RHEL-8.3.0] cloud-init rebase to 19.4)
|
||||
* Mon Apr 20 2020 Miroslav Rezanina <mrezanin@redhat.coM> - 19.4-1.el8.1
|
||||
- Rebase to cloud-init 19.4 [bz#1811912]
|
||||
- Resolves: bz#1811912
|
||||
([RHEL-8.2.1] cloud-init rebase to 19.4)
|
||||
|
||||
* Tue Mar 10 2020 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-12.el8
|
||||
- ci-Remove-race-condition-between-cloud-init-and-Network.patch [bz#1807797]
|
||||
|
|
|
|||
Loading…
Reference in New Issue