Hello community, here is the log from the commit of package cloud-init for openSUSE:Factory checked in at 2020-08-14 09:29:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cloud-init (Old) and /work/SRC/openSUSE:Factory/.cloud-init.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cloud-init" Fri Aug 14 09:29:39 2020 rev:74 rq:826089 version:20.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cloud-init/cloud-init.changes 2020-06-21 19:45:16.392693304 +0200 +++ /work/SRC/openSUSE:Factory/.cloud-init.new.3399/cloud-init.changes 2020-08-14 09:29:40.224285911 +0200 @@ -1,0 +2,199 @@ +Fri Jul 24 19:55:40 UTC 2020 - Robert Schweikert <[email protected]> + +- Update to version 20.2 (bsc#1174443, bsc#1174444) + + Remove patches included upstream: + - 0001-Make-tests-work-with-Python-3.8-139.patch + - cloud-init-ostack-metadat-dencode.patch + - cloud-init-use-different-random-src.diff + - cloud-init-long-pass.patch + - cloud-init-mix-static-dhcp.patch + + Remove patches build switched to Python 3 for all distributions + - cloud-init-python2-sigpipe.patch + - cloud-init-template-py2.patch + + Add + - cloud-init-after-kvp.diff + - cloud-init-recognize-hpc.patch + + doc/format: reference make-mime.py instead of an inline script (#334) + + Add docs about creating parent folders (#330) [Adrian Wilkins] + + DataSourceNoCloud/OVF: drop claim to support FTP (#333) (LP: #1875470) + + schema: ignore spurious pylint error (#332) + + schema: add json schema for write_files module (#152) + + BSD: find_devs_with_ refactoring (#298) [Gonéri Le Bouder] + + nocloud: drop work around for Linux 2.6 (#324) [Gonéri Le Bouder] + + cloudinit: drop dependencies on unittest2 and contextlib2 (#322) + + distros: handle a potential mirror filtering error case (#328) + + log: remove unnecessary import fallback logic (#327) + + .travis.yml: don't run integration test on ubuntu/* branches (#321) + + More unit test documentation (#314) + + conftest: introduce disable_subp_usage autouse fixture (#304) + + YAML align indent sizes for docs readability (#323) [Tak Nishigori] + + network_state: add missing space to log message (#325) + + tests: add missing mocks for get_interfaces_by_mac (#326) (LP: #1873910) + + test_mounts: expand happy path test for both happy paths (#319) + + cc_mounts: fix incorrect format specifiers (#316) (LP: #1872836) + + swap file "size" being used before checked if str (#315) [Eduardo Otubo] + + HACKING.rst: add pytest version gotchas section (#311) + + docs: Add steps to re-run cloud-id and cloud-init (#313) [Joshua Powers] + + readme: OpenBSD is now supported (#309) [Gonéri Le Bouder] + + net: ignore 'renderer' key in netplan config (#306) (LP: #1870421) + + Add support for NFS/EFS mounts (#300) [Andrew Beresford] (LP: #1870370) + + openbsd: set_passwd should not unlock user (#289) [Gonéri Le Bouder] + + tools/.github-cla-signers: add beezly as CLA signer (#301) + + util: remove unnecessary lru_cache import fallback (#299) + + HACKING.rst: reorganise/update CLA signature info (#297) + + distros: drop leading/trailing hyphens from mirror URL labels (#296) + + HACKING.rst: add note about variable annotations (#295) + + CiTestCase: stop using and remove sys_exit helper (#283) + + distros: replace invalid characters in mirror URLs with hyphens (#291) + (LP: #1868232) + + rbxcloud: gracefully handle arping errors (#262) [Adam Dobrawy] + + Fix cloud-init ignoring some misdeclared mimetypes in user-data. + [Kurt Garloff] + + net: ubuntu focal prioritize netplan over eni even if both present + (#267) (LP: #1867029) + + cloudinit: refactor util.is_ipv4 to net.is_ipv4_address (#292) + + net/cmdline: replace type comments with annotations (#294) + + HACKING.rst: add Type Annotations design section (#293) + + net: introduce is_ip_address function (#288) + + CiTestCase: remove now-unneeded parse_and_read helper method (#286) + + .travis.yml: allow 30 minutes of inactivity in cloud tests (#287) + + sources/tests/test_init: drop use of deprecated inspect.getargspec (#285) + + setup.py: drop NIH check_output implementation (#282) + + Identify SAP Converged Cloud as OpenStack [Silvio Knizek] + + add Openbsd support (#147) [Gonéri Le Bouder] + + HACKING.rst: add examples of the two test class types (#278) + + VMWware: support to update guest info gc status if enabled (#261) + [xiaofengw-vmware] + + Add lp-to-git mapping for kgarloff (#279) + + set_passwords: avoid chpasswd on BSD (#268) [Gonéri Le Bouder] + + HACKING.rst: add Unit Testing design section (#277) + + util: read_cc_from_cmdline handle urlencoded yaml content (#275) + + distros/tests/test_init: add tests for _get_package_mirror_info (#272) + + HACKING.rst: add links to new Code Review Process doc (#276) + + freebsd: ensure package update works (#273) [Gonéri Le Bouder] + + doc: introduce Code Review Process documentation (#160) + + tools: use python3 (#274) + + cc_disk_setup: fix RuntimeError (#270) (LP: #1868327) + + cc_apt_configure/util: combine search_for_mirror implementations (#271) + + bsd: boottime does not depend on the libc soname (#269) + [Gonéri Le Bouder] + + test_oracle,DataSourceOracle: sort imports (#266) + + DataSourceOracle: update .network_config docstring (#257) + + cloudinit/tests: remove unneeded with_logs configuration (#263) + + .travis.yml: drop stale comment (#255) + + .gitignore: add more common directories (#258) + + ec2: render network on all NICs and add secondary IPs as static (#114) + (LP: #1866930) + + ec2 json validation: fix the reference to the 'merged_cfg' key (#256) + [Paride Legovini] + + releases.yaml: quote the Ubuntu version numbers (#254) [Paride Legovini] + + cloudinit: remove six from packaging/tooling (#253) + + util/netbsd: drop six usage (#252) + + workflows: introduce stale pull request workflow (#125) + + cc_resolv_conf: introduce tests and stabilise output across Python + versions (#251) + + fix minor issue with resolv_conf template (#144) [andreaf74] + + doc: CloudInit also support NetBSD (#250) [Gonéri Le Bouder] + + Add Netbsd support (#62) [Gonéri Le Bouder] + + tox.ini: avoid substition syntax that causes a traceback on xenial (#245) + + Add pub_key_ed25519 to cc_phone_home (#237) [Daniel Hensby] + + Introduce and use of a list of GitHub usernames that have signed CLA + (#244) + + workflows/cla.yml: use correct username for CLA check (#243) + + tox.ini: use xenial version of jsonpatch in CI (#242) + + workflows: CLA validation altered to fail status on pull_request (#164) + + tox.ini: bump pyflakes version to 2.1.1 (#239) + + cloudinit: move to pytest for running tests (#211) + + instance-data: add cloud-init merged_cfg and sys_info keys to json + (#214) (LP: #1865969) + + ec2: Do not fallback to IMDSv1 on EC2 (#216) + + instance-data: write redacted cfg to instance-data.json (#233) + (LP: #1865947) + + net: support network-config:disabled on the kernel commandline (#232) + (LP: #1862702) + + ec2: only redact token request headers in logs, avoid altering request + (#230) (LP: #1865882) + + docs: typo fixed: dta → data [Alexey Vazhnov] + + Fixes typo on Amazon Web Services (#217) [Nick Wales] + + Fix docs for OpenStack DMI Asset Tag (#228) + [Mark T. Voelker] (LP: #1669875) + + Add physical network type: cascading to openstack helpers (#200) + [sab-systems] + + tests: add focal integration tests for ubuntu (#225) + +- From 20.1 (first vesrion after 19.4) + + ec2: Do not log IMDSv2 token values, instead use REDACTED (#219) + (LP: #1863943) + + utils: use SystemRandom when generating random password. (#204) + [Dimitri John Ledkov] + + docs: mount_default_files is a list of 6 items, not 7 (#212) + + azurecloud: fix issues with instances not starting (#205) (LP: #1861921) + + unittest: fix stderr leak in cc_set_password random unittest + output. (#208) + + cc_disk_setup: add swap filesystem force flag (#207) + + import sysvinit patches from freebsd-ports tree (#161) [Igor Galić] + + docs: fix typo (#195) [Edwin Kofler] + + sysconfig: distro-specific config rendering for BOOTPROTO option (#162) + [Robert Schweikert] (LP: #1800854) + + cloudinit: replace "from six import X" imports (except in util.py) (#183) + + run-container: use 'test -n' instead of 'test ! -z' (#202) + [Paride Legovini] + + net/cmdline: correctly handle static ip= config (#201) + [Dimitri John Ledkov] (LP: #1861412) + + Replace mock library with unittest.mock (#186) + + HACKING.rst: update CLA link (#199) + + Scaleway: Fix DatasourceScaleway to avoid backtrace (#128) + [Louis Bouchard] + + cloudinit/cmd/devel/net_convert.py: add missing space (#191) + + tools/run-container: drop support for python2 (#192) [Paride Legovini] + + Print ssh key fingerprints using sha256 hash (#188) (LP: #1860789) + + Make the RPM build use Python 3 (#190) [Paride Legovini] + + cc_set_password: increase random pwlength from 9 to 20 (#189) + (LP: #1860795) + + .travis.yml: use correct Python version for xenial tests (#185) + + cloudinit: remove ImportError handling for mock imports (#182) + + Do not use fallocate in swap file creation on xfs. (#70) + [Eduardo Otubo] (LP: #1781781) + + .readthedocs.yaml: install cloud-init when building docs (#181) + (LP: #1860450) + + Introduce an RTD config file, and pin the Sphinx version to the RTD + default (#180) + + Drop most of the remaining use of six (#179) + + Start removing dependency on six (#178) + + Add Rootbox & HyperOne to list of cloud in README (#176) [Adam Dobrawy] + + docs: add proposed SRU testing procedure (#167) + + util: rename get_architecture to get_dpkg_architecture (#173) + + Ensure util.get_architecture() runs only once (#172) + + Only use gpart if it is the BSD gpart (#131) [Conrad Hoffmann] + + freebsd: remove superflu exception mapping (#166) [Gonéri Le Bouder] + + ssh_auth_key_fingerprints_disable test: fix capitalization (#165) + [Paride Legovini] + + util: move uptime's else branch into its own boottime function (#53) + [Igor Galić] (LP: #1853160) + + workflows: add contributor license agreement checker (#155) + + net: fix rendering of 'static6' in network config (#77) (LP: #1850988) + + Make tests work with Python 3.8 (#139) [Conrad Hoffmann] + + fixed minor bug with mkswap in cc_disk_setup.py (#143) [andreaf74] + + freebsd: fix create_group() cmd (#146) [Gonéri Le Bouder] + + doc: make apt_update example consistent (#154) + + doc: add modules page toc with links (#153) (LP: #1852456) + + Add support for the amazon variant in cloud.cfg.tmpl (#119) + [Frederick Lefebvre] + + ci: remove Python 2.7 from CI runs (#137) + + modules: drop cc_snap_config config module (#134) + + migrate-lp-user-to-github: ensure Launchpad repo exists (#136) + + docs: add initial troubleshooting to FAQ (#104) [Joshua Powers] + + doc: update cc_set_hostname frequency and descrip (#109) + [Joshua Powers] (LP: #1827021) + + freebsd: introduce the freebsd renderer (#61) [Gonéri Le Bouder] + + cc_snappy: remove deprecated module (#127) + + HACKING.rst: clarify that everyone needs to do the LP->GH dance (#130) + + freebsd: cloudinit service requires devd (#132) [Gonéri Le Bouder] + + cloud-init: fix capitalisation of SSH (#126) + + doc: update cc_ssh clarify host and auth keys + [Joshua Powers] (LP: #1827021) + + ci: emit names of tests run in Travis (#120) + + ++++ 2 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cloud-init/cloud-init.changes ++++ and /work/SRC/openSUSE:Factory/.cloud-init.new.3399/cloud-init.changes Old: ---- 0001-Make-tests-work-with-Python-3.8-139.patch cloud-init-19.4.tar.gz cloud-init-long-pass.patch cloud-init-mix-static-dhcp.patch cloud-init-ostack-metadat-dencode.patch cloud-init-python2-sigpipe.patch cloud-init-template-py2.patch cloud-init-use-different-random-src.diff New: ---- cloud-init-20.2.tar.gz cloud-init-after-kvp.diff cloud-init-recognize-hpc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cloud-init.spec ++++++ --- /var/tmp/diff_new_pack.HZoFO7/_old 2020-08-14 09:29:40.932286274 +0200 +++ /var/tmp/diff_new_pack.HZoFO7/_new 2020-08-14 09:29:40.936286275 +0200 @@ -18,7 +18,7 @@ %global configver 0.7 Name: cloud-init -Version: 19.4 +Version: 20.2 Release: 0 License: GPL-3.0 Summary: Cloud node initialization tool @@ -26,35 +26,24 @@ Group: System/Management Source0: %{name}-%{version}.tar.gz Source1: rsyslog-cloud-init.cfg -Patch0: 0001-Make-tests-work-with-Python-3.8-139.patch -# FIXME -# python2 disables SIGPIPE, causing broken pipe errors in shell scripts (bsc#903449) -Patch20: cloud-init-python2-sigpipe.patch -Patch21: cloud-init-template-py2.patch Patch29: datasourceLocalDisk.patch Patch34: cloud-init-tests-set-exec.patch -# FIXME (lp#1801364) -Patch42: cloud-init-ostack-metadat-dencode.patch # FIXME (lp#1812117) Patch43: cloud-init-write-routes.patch # FIXME (lp#1849296) Patch52: cloud-init-break-resolv-symlink.patch -# FIXME (lp#1858808) -Patch55: cloud-init-mix-static-dhcp.patch # FIXME no proposed solution Patch56: cloud-init-sysconf-path.patch # FIXME (lp#1860164) Patch57: cloud-init-no-tempnet-oci.patch -Patch58: cloud-init-use-different-random-src.diff -Patch59: cloud-init-long-pass.patch - +Patch58: cloud-init-after-kvp.diff +Patch59: cloud-init-recognize-hpc.patch BuildRequires: fdupes BuildRequires: filesystem # pkg-config is needed to find correct systemd unit dir BuildRequires: pkg-config # needed for /lib/udev BuildRequires: pkgconfig(udev) -%if 0%{?suse_version} > 1320 BuildRequires: python3-devel BuildRequires: python3-setuptools # Test requirements @@ -66,16 +55,8 @@ BuildRequires: python3-mock BuildRequires: python3-nose BuildRequires: python3-oauthlib +BuildRequires: python3-pytest BuildRequires: python3-requests -#BuildRequires: python3-testtools -%else -BuildRequires: python-devel -BuildRequires: python-Jinja2 -BuildRequires: python-PyYAML -BuildRequires: python-requests -BuildRequires: python-setuptools -BuildRequires: python-six -%endif %if 0%{?is_opensuse} BuildRequires: openSUSE-release %else @@ -89,7 +70,6 @@ Requires: e2fsprogs Requires: net-tools Requires: openssh -%if 0%{?suse_version} > 1320 Requires: python3-configobj >= 5.0.2 Requires: python3-Jinja2 Requires: python3-jsonpatch @@ -101,31 +81,15 @@ Requires: python3-setuptools Requires: python3-six Requires: python3-xml -%else -Requires: python-argparse -Requires: python-configobj >= 5.0.2 -Requires: python-Jinja2 -Requires: python-jsonpatch -Requires: python-jsonschema -Requires: python-oauthlib -Requires: python-pyserial -Requires: python-PyYAML -Requires: python-requests -Requires: python-setuptools -Requires: python-six -Requires: python-xml -%endif Requires: sudo Requires: util-linux +Requires: wicked-service Requires: cloud-init-config = %configver BuildRoot: %{_tmppath}/%{name}-%{version}-build %define docdir %{_defaultdocdir}/%{name} %ifarch %ix86 x86_64 Requires: dmidecode %endif -%if 0%{?suse_version} && 0%{?suse_version} <= 1210 -%define initsys sysvinit_suse -%else %define initsys systemd BuildRequires: pkgconfig(systemd) %{?systemd_requires} @@ -134,12 +98,6 @@ %else %define systemd_prefix /usr/lib %endif -%endif -%if 0%{?suse_version} && 0%{?suse_version} >= 1315 -Requires: wicked-service -%else -Requires: sysconfig-network -%endif %description Cloud-init is an init script that initializes a cloud node (VM) @@ -166,62 +124,27 @@ Documentation and examples for cloud-init tools -#%package test -#Summary: Cloud node initialization tool - Testsuite -#Group: System/Management -#Requires: cloud-init = %{version} -# -#%description test -#Cloud-init is an init script that initializes a cloud node (VM) -#according to the fetched configuration data from the admin node. -# -#Unit tests for the cloud-init tools - %prep %setup -q -%patch0 -p1 -%if 0%{?suse_version} < 1315 -%patch20 -%patch21 -%endif %patch29 -p0 %patch34 -%patch42 %patch43 %patch52 -%patch55 -p0 %patch56 %patch57 %patch58 -p1 %patch59 %build -%if 0%{?suse_version} && 0%{?suse_version} <= 1315 -python setup.py build -%else python3 setup.py build -%endif - -#%if 0%{?suse_version} > 1320 -#%check -## these tests are currently failing due to suse patches -#rm -v tests/unittests/test_distros/test_netconfig.py -#rm -v tests/unittests/test_net.py +%check ## Ignore test failure currently not doing anything with opennebula -#rm -v tests/unittests/test_datasource/test_opennebula.py -## To be investigated -#rm -v tests/unittests/test_handler/test_handler_ntp.py -#make test -#%endif - +rm -v tests/unittests/test_datasource/test_opennebula.py +make unittest3 %install -%if 0%{?suse_version} && 0%{?suse_version} <= 1315 -python setup.py install --root=%{buildroot} --prefix=%{_prefix} --install-lib=%{python_sitelib} --init-system=%{initsys} -%else python3 setup.py install --root=%{buildroot} --prefix=%{_prefix} --install-lib=%{python3_sitelib} --init-system=%{initsys} -%endif find %{buildroot} \( -name .gitignore -o -name .placeholder \) -delete # from debian install script for x in "%{buildroot}%{_bindir}/"*.py; do @@ -259,30 +182,10 @@ rm %{buildroot}/%{_sysconfdir}/cloud/templates/*.redhat.* rm %{buildroot}/%{_sysconfdir}/cloud/templates/*.ubuntu.* -# move sysvinit scripts into the "right" place -%if 0%{?suse_version} && 0%{?suse_version} <= 1210 -mkdir -p %{buildroot}/%{_initddir} -mkdir -p %{buildroot}/%{_sbindir} -pushd "%{buildroot}%{_initddir}" -for iniF in *; do - ln -s "%{_initddir}/${iniF}" "%{buildroot}/%{_sbindir}/rc${iniF}" -done -popd -%endif - # remove duplicate files %if 0%{?suse_version} -%if 0%{?suse_version} <= 1315 -%fdupes %{buildroot}%{python_sitelib} -%else %fdupes %{buildroot}%{python3_sitelib} %endif -%endif - -%if 0%{?suse_version} && 0%{?suse_version} <= 1210 -%postun -%insserv_cleanup -%endif %files %defattr(-,root,root) @@ -301,24 +204,9 @@ %dir %{_datadir}/bash-completion/completions %endif %{_datadir}/bash-completion/completions/cloud-init -%if 0%{?suse_version} && 0%{?suse_version} <= 1315 -%{python_sitelib}/cloudinit -%{python_sitelib}/cloud_init-%{version}-py%{py_ver}.egg-info -%else %{python3_sitelib}/cloudinit %{python3_sitelib}/cloud_init-%{version}-py%{py3_ver}.egg-info -%endif %{_prefix}/lib/cloud-init -%if 0%{?suse_version} && 0%{?suse_version} <= 1210 -%{_sbindir}/rccloud-config -%{_sbindir}/rccloud-init -%{_sbindir}/rccloud-init-local -%{_sbindir}/rccloud-final -%attr(0755, root, root) %{_initddir}/cloud-config -%attr(0755, root, root) %{_initddir}/cloud-init -%attr(0755, root, root) %{_initddir}/cloud-init-local -%attr(0755, root, root) %{_initddir}/cloud-final -%else %{systemd_prefix}/systemd/system-generators/cloud-init-generator %{systemd_prefix}/systemd/system/cloud-config.service %{systemd_prefix}/systemd/system/cloud-config.target @@ -326,17 +214,9 @@ %{systemd_prefix}/systemd/system/cloud-init.service %{systemd_prefix}/systemd/system/cloud-init.target %{systemd_prefix}/systemd/system/cloud-final.service -%endif -%if 0%{?suse_version} && 0%{?suse_version} > 1110 %dir %{_sysconfdir}/rsyslog.d %{_sysconfdir}/rsyslog.d/21-cloudinit.conf /usr/lib/udev/rules.d/66-azure-ephemeral.rules -# This if condition really distinquished between OBS and IBS. -# For SLE 12 builds in OBS owning the directories is not required, while -# SLE 12 builds in IBS require owning the directories -%else -/lib/udev/rules.d/66-azure-ephemeral.rules -%endif %dir %attr(0755, root, root) %{_localstatedir}/lib/cloud %dir %{docdir} %dir /etc/NetworkManager ++++++ cloud-init-19.4.tar.gz -> cloud-init-20.2.tar.gz ++++++ ++++ 19355 lines of diff (skipped) ++++++ cloud-init-after-kvp.diff ++++++ diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl index ff9c644d..7166f640 100644 --- a/systemd/cloud-init-local.service.tmpl +++ b/systemd/cloud-init-local.service.tmpl @@ -5,6 +5,7 @@ Description=Initial cloud-init job (pre-networking) DefaultDependencies=no {% endif %} Wants=network-pre.target +After=hv_kvp_daemon.service After=systemd-remount-fs.service Before=NetworkManager.service Before=network-pre.target ++++++ cloud-init-recognize-hpc.patch ++++++ --- cloudinit/util.py.orig +++ cloudinit/util.py @@ -656,7 +656,9 @@ def system_info(): elif linux_dist == 'redhat': var = 'rhel' elif linux_dist in ( - 'opensuse', 'opensuse-tumbleweed', 'opensuse-leap', 'sles'): + 'opensuse', 'opensuse-tumbleweed', 'opensuse-leap', + 'sles', 'sle_hpc' + ): var = 'suse' else: var = 'linux'
