Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cloud-init for openSUSE:Factory
checked in at 2021-08-24 10:54:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cloud-init (Old)
and /work/SRC/openSUSE:Factory/.cloud-init.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cloud-init"
Tue Aug 24 10:54:11 2021 rev:83 rq:913169 version:21.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/cloud-init/cloud-init.changes 2021-08-16
10:12:58.939000205 +0200
+++ /work/SRC/openSUSE:Factory/.cloud-init.new.1899/cloud-init.changes
2021-08-24 10:54:52.632320601 +0200
@@ -1,0 +2,515 @@
+Thu Aug 12 11:27:19 UTC 2021 - Robert Schweikert <rjsch...@suse.com>
+
+- Update to version 21.2 (bsc#1186004)
+ + Remove patches included upstream:
+ - cloud-init-azure-def-usr-pass.patch
+ - cloud-init-after-kvp.diff
+ - cloud-init-recognize-hpc.patch
+ - use_arroba_to_include_sudoers_directory-bsc_1181283.patch
+ - cloud-init-bonding-opts.patch
+ - cloud-init-log-file-mode.patch
+ - cloud-init-no-pwd-in-log.patch
+ - 0001-templater-drop-Jinja-Python-2-compatibility-shim.patch
+ + Remove cloud-init-sle12-compat.patch, version in SLE 12 is frozen to 20.2
+ + Remove cloud-init-tests-set-exec.patch no longer needed
+ + Forward port:
+ - cloud-init-write-routes.patch
+ - cloud-init-break-resolv-symlink.patch
+ - cloud-init-sysconf-path.patch
+ - cloud-init-no-tempnet-oci.patch
+ + Add \r\n check for SSH keys in Azure (#889)
+ + Revert "Add support to resize rootfs if using LVM (#721)" (#887)
+ (LP: #1922742)
+ + Add Vultaire as contributor (#881) [Paul Goins]
+ + Azure: adding support for consuming userdata from IMDS (#884) [Anh Vo]
+ + test_upgrade: modify test_upgrade_package to run for more sources (#883)
+ + Fix chef module run failure when chef_license is set (#868) [Ben Hughes]
+ + Azure: Retry net metadata during nic attach for non-timeout errs (#878)
+ [aswinrajamannar]
+ + Azure: Retrieve username and hostname from IMDS (#865) [Thomas Stringer]
+ + Azure: eject the provisioning iso before reporting ready (#861) [Anh Vo]
+ + Use `partprobe` to re-read partition table if available (#856)
+ [Nicolas Bock] (LP: #1920939)
+ + fix error on upgrade caused by new vendordata2 attributes (#869)
+ (LP: #1922739)
+ + add prefer_fqdn_over_hostname config option (#859)
+ [hamalq] (LP: #1921004)
+ + Emit dots on travis to avoid timeout (#867)
+ + doc: Replace remaining references to user-scripts as a config module
+ (#866) [Ryan Harper]
+ + azure: Removing ability to invoke walinuxagent (#799) [Anh Vo]
+ + Add Vultr support (#827) [David Dymko]
+ + Fix unpickle for source paths missing run_dir (#863)
+ [lucasmoura] (LP: #1899299)
+ + sysconfig: use BONDING_MODULE_OPTS on SUSE (#831) [Jens Sandmann]
+ + bringup_static_routes: fix gateway check (#850) [Petr Fedchenkov]
+ + add hamalq user (#860) [hamalq]
+ + Add support to resize rootfs if using LVM (#721)
+ [Eduardo Otubo] (LP: #1799953)
+ + Fix mis-detecting network configuration in initramfs cmdline (#844)
+ (LP: #1919188)
+ + tools/write-ssh-key-fingerprints: do not display empty header/footer
+ (#817) [dermotbradley]
+ + Azure helper: Ensure Azure http handler sleeps between retries (#842)
+ [Johnson Shi]
+ + Fix chef apt source example (#826) [timothegenzmer]
+ + .travis.yml: generate an SSH key before running tests (#848)
+ + write passwords only to serial console, lock down cloud-init-output.log
+ (#847) (LP: #1918303)
+ + Fix apt default integration test (#845)
+ + integration_tests: bump pycloudlib dependency (#846)
+ + Fix stack trace if vendordata_raw contained an array (#837) [eb3095]
+ + archlinux: Fix broken locale logic (#841)
+ [Kristian Klausen] (LP: #1402406)
+ + Integration test for #783 (#832)
+ + integration_tests: mount more paths IN_PLACE (#838)
+ + Fix requiring device-number on EC2 derivatives (#836) (LP: #1917875)
+ + Remove the vi comment from the part-handler example (#835)
+ + net: exclude OVS internal interfaces in get_interfaces (#829)
+ (LP: #1912844)
+ + tox.ini: pass OS_* environment variables to integration tests (#830)
+ + integration_tests: add OpenStack as a platform (#804)
+ + Add flexibility to IMDS api-version (#793) [Thomas Stringer]
+ + Fix the TestApt tests using apt-key on Xenial and Hirsute (#823)
+ [Paride Legovini] (LP: #1916629)
+ + doc: remove duplicate "it" from nocloud.rst (#825) [V.I. Wood]
+ + archlinux: Use hostnamectl to set the transient hostname (#797)
+ [Kristian Klausen]
+ + cc_keys_to_console.py: Add documentation for recently added config key
+ (#824) [dermotbradley]
+ + Update cc_set_hostname documentation (#818) [Toshi Aoyama]
+
+From 21.1
+ + Azure: Support for VMs without ephemeral resource disks. (#800)
+ [Johnson Shi] (LP: #1901011)
+ + cc_keys_to_console: add option to disable key emission (#811)
+ [Michael Hudson-Doyle] (LP: #1915460)
+ + integration_tests: introduce lxd_use_exec mark (#802)
+ + azure: case-insensitive UUID to avoid new IID during kernel upgrade
+ (#798) (LP: #1835584)
+ + stale.yml: don't ask submitters to reopen PRs (#816)
+ + integration_tests: fix use of SSH agent within tox (#815)
+ + integration_tests: add UPGRADE CloudInitSource (#812)
+ + integration_tests: use unique MAC addresses for tests (#813)
+ + Update .gitignore (#814)
+ + Port apt cloud_tests to integration tests (#808)
+ + integration_tests: fix test_gh626 on LXD VMs (#809)
+ + Fix attempting to decode binary data in test_seed_random_data test (#806)
+ + Remove wait argument from tests with session_cloud calls (#805)
+ + Datasource for UpCloud (#743) [Antti Myyr??]
+ + test_gh668: fix failure on LXD VMs (#801)
+ + openstack: read the dynamic metadata group vendor_data2.json (#777)
+ [Andrew Bogott] (LP: #1841104)
+ + includedir in suoders can be prefixed by "arroba" (#783)
+ [Jordi Massaguer Pla]
+ + [VMware] change default max wait time to 15s (#774) [xiaofengw-vmware]
+ + Revert integration test associated with reverted #586 (#784)
+ + Add jordimassaguerpla as contributor (#787) [Jordi Massaguer Pla]
+ + Add Rick Harding to CLA signers (#792) [Rick Harding]
+ + HACKING.rst: add clarifying note to LP CLA process section (#789)
+ + Stop linting cloud_tests (#791)
+ + cloud-tests: update cryptography requirement (#790) [Joshua Powers]
+ + Remove 'remove-raise-on-failure' calls from integration_tests (#788)
+ + Use more cloud defaults in integration tests (#757)
+ + Adding self to cla signers (#776) [Andrew Bogott]
+ + doc: avoid two warnings (#781) [Dan Kenigsberg]
+ + Use proper spelling for Red Hat (#778) [Dan Kenigsberg]
+ + Add antonyc to .github-cla-signers (#747) [Anton Chaporgin]
+ + integration_tests: log image serial if available (#772)
+ + [VMware] Support cloudinit raw data feature (#691) [xiaofengw-vmware]
+ + net: Fix static routes to host in eni renderer (#668) [Pavel Abalikhin]
+ + .travis.yml: don't run cloud_tests in CI (#756)
+ + test_upgrade: add some missing commas (#769)
+ + cc_seed_random: update documentation and fix integration test (#771)
+ (LP: #1911227)
+ + Fix test gh-632 test to only run on NoCloud (#770) (LP: #1911230)
+ + archlinux: fix package upgrade command handling (#768) [Bao Trinh]
+ + integration_tests: add integration test for LP: #1910835 (#761)
+ + Fix regression with handling of IMDS ssh keys (#760) [Thomas Stringer]
+ + integration_tests: log cloud-init version in SUT (#758)
+ + Add ajmyyra as contributor (#742) [Antti Myyr??]
+ + net_convert: add some missing help text (#755)
+ + Missing IPV6_AUTOCONF=no to render sysconfig dhcp6 stateful on RHEL
+ (#753) [Eduardo Otubo]
+ + doc: document missing IPv6 subnet types (#744) [Antti Myyr??]
+ + Add example configuration for datasource `AliYun` (#751) [Xiaoyu Zhong]
+ + integration_tests: add SSH key selection settings (#754)
+ + fix a typo in man page cloud-init.1 (#752) [Amy Chen]
+ + network-config-format-v2.rst: add Netplan Passthrough section (#750)
+ + stale: re-enable post holidays (#749)
+ + integration_tests: port ca_certs tests from cloud_tests (#732)
+ + Azure: Add telemetry for poll IMDS (#741) [Johnson Shi]
+ + doc: move testing section from HACKING to its own doc (#739)
+ + No longer allow integration test failures on travis (#738)
+ + stale: fix error in definition (#740)
+ + integration_tests: set log-cli-level to INFO by default (#737)
+ + PULL_REQUEST_TEMPLATE.md: use backticks around commit message (#736)
+ + stale: disable check for holiday break (#735)
+ + integration_tests: log the path we collect logs into (#733)
+ + .travis.yml: add (most) supported Python versions to CI (#734)
+ + integration_tests: fix IN_PLACE CLOUD_INIT_SOURCE (#731)
+ + cc_ca_certs: add RHEL support (#633) [cawamata]
+ + Azure: only generate config for NICs with addresses (#709)
+ [Thomas Stringer]
+ + doc: fix CloudStack configuration example (#707) [Olivier Lemasle]
+ + integration_tests: restrict test_lxd_bridge appropriately (#730)
+ + Add integration tests for CLI functionality (#729)
+ + Integration test for gh-626 (#728)
+ + Some test_upgrade fixes (#726)
+ + Ensure overriding test vars with env vars works for booleans (#727)
+ + integration_tests: port lxd_bridge test from cloud_tests (#718)
+ + Integration test for gh-632. (#725)
+ + Integration test for gh-671 (#724)
+ + integration-requirements.txt: bump pycloudlib commit (#723)
+ + Drop unnecessary shebang from cmd/main.py (#722) [Eduardo Otubo]
+ + Integration test for LP: #1813396 and #669 (#719)
+ + integration_tests: include timestamp in log output (#720)
+ + integration_tests: add test for LP: #1898997 (#713)
+ + Add integration test for power_state_change module (#717)
+ + Update documentation for network-config-format-v2 (#701) [ggiesen]
+ + sandbox CA Cert tests to not require ca-certificates (#715)
+ [Eduardo Otubo]
+ + Add upgrade integration test (#693)
+ + Integration test for 570 (#712)
+ + Add ability to keep snapshotted images in integration tests (#711)
+ + Integration test for pull #586 (#706)
+ + integration_tests: introduce skipping of tests by OS (#702)
+ + integration_tests: introduce IntegrationInstance.restart (#708)
+ + Add lxd-vm to list of valid integration test platforms (#705)
+ + Adding BOOTPROTO = dhcp to render sysconfig dhcp6 stateful on RHEL
+ (#685) [Eduardo Otubo]
+ + Delete image snapshots created for integration tests (#682)
+ + Parametrize ssh_keys_provided integration test (#700) [lucasmoura]
+ + Drop use_sudo attribute on IntegrationInstance (#694) [lucasmoura]
+ + cc_apt_configure: add riscv64 as a ports arch (#687)
+ [Dimitri John Ledkov]
+ + cla: add xnox (#692) [Dimitri John Ledkov]
+ + Collect logs from integration test runs (#675)
+
+From 20.4.1
+ + Revert "ssh_util: handle non-default AuthorizedKeysFile config (#586)"
+
+From 20.4
+ + tox: avoid tox testenv subsvars for xenial support (#684)
+ + Ensure proper root permissions in integration tests (#664) [James Falcon]
+ + LXD VM support in integration tests (#678) [James Falcon]
+ + Integration test for fallocate falling back to dd (#681) [James Falcon]
+ + .travis.yml: correctly integration test the built .deb (#683)
++++ 318 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/cloud-init/cloud-init.changes
++++ and /work/SRC/openSUSE:Factory/.cloud-init.new.1899/cloud-init.changes
Old:
----
0001-templater-drop-Jinja-Python-2-compatibility-shim.patch
cloud-init-20.2.tar.gz
cloud-init-after-kvp.diff
cloud-init-azure-def-usr-pass.patch
cloud-init-bonding-opts.patch
cloud-init-log-file-mode.patch
cloud-init-no-pwd-in-log.patch
cloud-init-recognize-hpc.patch
cloud-init-sle12-compat.patch
cloud-init-tests-set-exec.patch
use_arroba_to_include_sudoers_directory-bsc_1181283.patch
New:
----
cloud-init-21.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cloud-init.spec ++++++
--- /var/tmp/diff_new_pack.ECwLbp/_old 2021-08-24 10:54:53.216319828 +0200
+++ /var/tmp/diff_new_pack.ECwLbp/_new 2021-08-24 10:54:53.216319828 +0200
@@ -18,7 +18,7 @@
%global configver 0.7
Name: cloud-init
-Version: 20.2
+Version: 21.2
Release: 0
License: GPL-3.0
Summary: Cloud node initialization tool
@@ -26,34 +26,19 @@
Group: System/Management
Source0: %{name}-%{version}.tar.gz
Source1: rsyslog-cloud-init.cfg
-Patch29: datasourceLocalDisk.patch
-Patch34: cloud-init-tests-set-exec.patch
+Patch1: datasourceLocalDisk.patch
# FIXME (lp#1812117)
-Patch43: cloud-init-write-routes.patch
+Patch2: cloud-init-write-routes.patch
# FIXME (lp#1849296)
-Patch52: cloud-init-break-resolv-symlink.patch
+Patch3: cloud-init-break-resolv-symlink.patch
# FIXME no proposed solution
-Patch56: cloud-init-sysconf-path.patch
+Patch4: cloud-init-sysconf-path.patch
# FIXME (lp#1860164)
-Patch57: cloud-init-no-tempnet-oci.patch
-Patch58: cloud-init-after-kvp.diff
-Patch59: cloud-init-recognize-hpc.patch
-# FIXME
https://github.com/canonical/cloud-init/commit/eea754492f074e00b601cf77aa278e3623857c5a
-Patch60: cloud-init-azure-def-usr-pass.patch
-Patch61: cloud-init-sle12-compat.patch
-Patch70: use_arroba_to_include_sudoers_directory-bsc_1181283.patch
-# FIXME https://github.com/canonical/cloud-init/pull/831
-Patch71: cloud-init-bonding-opts.patch
-# FIXME https://github.com/canonical/cloud-init/pull/858
-Patch72: cloud-init-log-file-mode.patch
-# FIXME upstream commit b794d426b9
-Patch73: cloud-init-no-pwd-in-log.patch
+Patch5: cloud-init-no-tempnet-oci.patch
# FIXME https://github.com/canonical/cloud-init/pull/857
-Patch74: cloud-init-purge-cache-py-ver-change.patch
-# PATCH-FIX-UPSTREAM
https://github.com/canonical/cloud-init/commit/f23a4c4262ac11cd75c99fcbfbfe453f4e115f18
-Patch75: 0001-templater-drop-Jinja-Python-2-compatibility-shim.patch
-# PATCH-FIX-UPSTREAM
https://github.com/canonical/cloud-init/commit/899bfaa9d6bfab1db0df99257628ca1f6febff60
-Patch76:
cloud-init-update-test-characters-in-substitution-unit-test.patch
+Patch6: cloud-init-purge-cache-py-ver-change.patch
+# FIXME
https://github.com/canonical/cloud-init/commit/899bfaa9d6bfab1db0df99257628ca1f6febff60
+Patch7:
cloud-init-update-test-characters-in-substitution-unit-test.patch
BuildRequires: fdupes
BuildRequires: filesystem
# pkg-config is needed to find correct systemd unit dir
@@ -143,27 +128,14 @@
%prep
%setup -q
-%patch29 -p0
-%patch34
-%patch43
-%patch52
-%patch56
-%patch57
-%patch58 -p1
-%patch59
-%patch60
-%if 0%{?suse_version} < 1500
-%patch61
-%endif
-%patch70 -p1
-%patch71
-%patch72
-%patch73
-%patch74
-%if 0%{?suse_version} >= 1550
-%patch75 -p1
-%endif
-%patch76 -p1
+%patch1 -p0
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
+%patch7 -p1
+
# patch in the full version to version.py
version_pys=$(find . -name version.py -type f)
[ -n "$version_pys" ] ||
@@ -176,7 +148,7 @@
%check
## Ignore test failure currently not doing anything with opennebula
rm -v tests/unittests/test_datasource/test_opennebula.py
-make unittest3
+make unittest
%install
python3 setup.py install --root=%{buildroot} --prefix=%{_prefix}
--install-lib=%{python3_sitelib} --init-system=%{initsys}
++++++ cloud-init-20.2.tar.gz -> cloud-init-21.2.tar.gz ++++++
++++ 46509 lines of diff (skipped)
++++++ cloud-init-break-resolv-symlink.patch ++++++
--- /var/tmp/diff_new_pack.ECwLbp/_old 2021-08-24 10:54:53.496319457 +0200
+++ /var/tmp/diff_new_pack.ECwLbp/_new 2021-08-24 10:54:53.496319457 +0200
@@ -1,6 +1,6 @@
--- cloudinit/net/sysconfig.py.orig
+++ cloudinit/net/sysconfig.py
-@@ -705,6 +705,11 @@ class Renderer(renderer.Renderer):
+@@ -918,6 +918,11 @@ class Renderer(renderer.Renderer):
resolv_content = self._render_dns(network_state,
existing_dns_path=dns_path)
if resolv_content:
@@ -11,4 +11,4 @@
+ os.unlink(dns_path)
util.write_file(dns_path, resolv_content, file_mode)
if self.networkmanager_conf_path:
- nm_conf_path = util.target_path(target,
+ nm_conf_path = subp.target_path(target,
++++++ cloud-init-no-tempnet-oci.patch ++++++
--- /var/tmp/diff_new_pack.ECwLbp/_old 2021-08-24 10:54:53.508319441 +0200
+++ /var/tmp/diff_new_pack.ECwLbp/_new 2021-08-24 10:54:53.508319441 +0200
@@ -1,25 +1,26 @@
--- cloudinit/sources/DataSourceOracle.py.orig
+++ cloudinit/sources/DataSourceOracle.py
-@@ -189,11 +189,17 @@ class DataSourceOracle(sources.DataSourc
+@@ -133,8 +133,11 @@ class DataSourceOracle(sources.DataSourc
+ BUILTIN_DS_CONFIG["configure_secondary_nics"]
+ )
+ network_context = noop()
+- if not _is_iscsi_root():
+- network_context = dhcp.EphemeralDHCPv4(net.find_fallback_nic())
++ # SUSE images are built with iSCSI setup. The detection of the
++ # configured network for iscsi boot is distribution dependent.
++ # There's no implementation for openSUSE/SLE yet.
++ #if not _is_iscsi_root():
++ # network_context = dhcp.EphemeralDHCPv4(net.find_fallback_nic())
+ with network_context:
+ fetched_metadata = read_opc_metadata(
+ fetch_vnics_data=fetch_vnics_data
+--- cloudinit/sources/tests/test_oracle.py.orig
++++ cloudinit/sources/tests/test_oracle.py
+@@ -666,6 +666,7 @@ class TestNonIscsiRoot_GetDataBehaviour:
+ def test_read_opc_metadata_called_with_ephemeral_dhcp(
+ self, m_find_fallback_nic, m_EphemeralDHCPv4, oracle_ds
+ ):
++ return
+ in_context_manager = False
- # network may be configured if iscsi root. If that is the case
- # then read_initramfs_config will return non-None.
-- if _is_iscsi_root():
-- data = self.crawl_metadata()
-- else:
-- with dhcp.EphemeralDHCPv4(net.find_fallback_nic()):
-- data = self.crawl_metadata()
-+ #if _is_iscsi_root():
-+ # data = self.crawl_metadata()
-+ #else:
-+ # with dhcp.EphemeralDHCPv4(net.find_fallback_nic()):
-+ # data = self.crawl_metadata()
-+ #
-+ # The detection of the configured network for iscsi boot is
-+ # distribution dependent and of course only implemented for
-+ # Debian/Ubuntu. We know the network is up as we are booting from
-+ # iscsi. Skip the BS and just read the damn data
-+ data = self.crawl_metadata()
-
- self._crawled_metadata = data
- vdata = data['2013-10-17']
+ def enter_context_manager():
++++++ cloud-init-sysconf-path.patch ++++++
--- /var/tmp/diff_new_pack.ECwLbp/_old 2021-08-24 10:54:53.520319425 +0200
+++ /var/tmp/diff_new_pack.ECwLbp/_new 2021-08-24 10:54:53.520319425 +0200
@@ -1,7 +1,7 @@
--- cloudinit/net/sysconfig.py.orig
+++ cloudinit/net/sysconfig.py
-@@ -891,9 +891,7 @@ def available_sysconfig(target=None):
- if not util.which(p, search=search, target=target):
+@@ -973,9 +973,7 @@ def available_sysconfig(target=None):
+ if not subp.which(p, search=search, target=target):
return False
- expected_paths = [
@@ -9,5 +9,5 @@
- 'etc/sysconfig/config']
+ expected_paths = ['etc/sysconfig/network/scripts/functions.netconfig']
for p in expected_paths:
- if os.path.isfile(util.target_path(target, p)):
+ if os.path.isfile(subp.target_path(target, p)):
return True
++++++ cloud-init-write-routes.patch ++++++
--- /var/tmp/diff_new_pack.ECwLbp/_old 2021-08-24 10:54:53.532319409 +0200
+++ /var/tmp/diff_new_pack.ECwLbp/_new 2021-08-24 10:54:53.532319409 +0200
@@ -1,16 +1,27 @@
-Index: cloudinit/distros/opensuse.py
-===================================================================
--- cloudinit/distros/opensuse.py.orig
+++ cloudinit/distros/opensuse.py
-@@ -11,6 +11,7 @@
+@@ -8,9 +8,12 @@
+ #
+ # This file is part of cloud-init. See LICENSE file for license information.
+
++import logging
++
from cloudinit import distros
from cloudinit.distros.parsers.hostname import HostnameConf
+from cloudinit.net.network_state import mask_to_net_prefix
from cloudinit import helpers
- from cloudinit import log as logging
-@@ -174,7 +175,147 @@ class Distro(distros.Distro):
+ from cloudinit import subp
+@@ -19,6 +22,7 @@ from cloudinit import util
+ from cloudinit.distros import rhel_util as rhutil
+ from cloudinit.settings import PER_INSTANCE
+
++LOG = logging.getLogger(__name__)
+
+ class Distro(distros.Distro):
+ clock_conf_fn = '/etc/sysconfig/clock'
+@@ -176,7 +180,147 @@ class Distro(distros.Distro):
util.write_file(out_fn, str(conf), 0o644)
def _write_network_config(self, netconfig):
