Hello community, here is the log from the commit of package cloud-init for openSUSE:Factory checked in at 2018-11-05 22:54:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cloud-init (Old) and /work/SRC/openSUSE:Factory/.cloud-init.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cloud-init" Mon Nov 5 22:54:45 2018 rev:54 rq:646077 version:18.4 Changes: -------- --- /work/SRC/openSUSE:Factory/cloud-init/cloud-init.changes 2018-10-29 14:58:26.613977045 +0100 +++ /work/SRC/openSUSE:Factory/.cloud-init.new/cloud-init.changes 2018-11-05 22:54:53.424093752 +0100 @@ -1,0 +2,10 @@ +Fri Nov 2 14:13:42 UTC 2018 - Robert Schweikert <rjschwei@suse.com> + +- Add cloud-init-ostack-metadat-dencode.patch (bsc#1101894) + +------------------------------------------------------------------- +Wed Oct 31 14:27:32 UTC 2018 - Robert Schweikert <rjschwei@suse.com> + +- Add cloud-init-static-net.patch (boo#1114160) + +------------------------------------------------------------------- New: ---- cloud-init-ostack-metadat-dencode.patch cloud-init-static-net.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cloud-init.spec ++++++ --- /var/tmp/diff_new_pack.bo89nN/_old 2018-11-05 22:54:54.048092962 +0100 +++ /var/tmp/diff_new_pack.bo89nN/_new 2018-11-05 22:54:54.052092958 +0100 @@ -49,6 +49,10 @@ # FIXME (lp#1799709) # https://code.launchpad.net/~rjschwei/cloud-init/+git/cloud-init/+merge/35775... Patch40: 0001-Fix-the-service-order-for-SUSE-distributions.patch +# FIXME (lp# 1800854) +Patch41: cloud-init-static-net.patch +# FIXME (lp#1801364) +Patch42: cloud-init-ostack-metadat-dencode.patch BuildRequires: fdupes BuildRequires: filesystem @@ -194,6 +198,8 @@ %patch38 %patch39 -p1 %patch40 -p1 +%patch41 +%patch42 %build %if 0%{?suse_version} && 0%{?suse_version} <= 1315 ++++++ cloud-init-ostack-metadat-dencode.patch ++++++ --- cloudinit/sources/helpers/openstack.py.orig +++ cloudinit/sources/helpers/openstack.py @@ -291,7 +291,10 @@ class BaseReader(object): if 'random_seed' in metadata: random_seed = metadata['random_seed'] try: - metadata['random_seed'] = base64.b64decode(random_seed) + metadata['random_seed'] = u'%s' % base64.b64decode(random_seed) + except UnicodeDecodeError: + # Did not decode as expected, probably utf-8 already + metadata['random_seed'] = random_seed except (ValueError, TypeError) as e: raise BrokenMetadata("Badly formatted metadata" " random_seed entry: %s" % e) ++++++ cloud-init-static-net.patch ++++++ --- cloudinit/net/sysconfig.py.orig +++ cloudinit/net/sysconfig.py @@ -314,7 +314,8 @@ class Renderer(renderer.Renderer): # ==> the following should not be set to 'static' # but should remain 'none' # if iface_cfg['BOOTPROTO'] == 'none': - # iface_cfg['BOOTPROTO'] = 'static' + # For SUSE this is different set to "static" + iface_cfg['BOOTPROTO'] = 'static' if subnet_is_ipv6(subnet): mtu_key = 'IPV6_MTU' iface_cfg['IPV6INIT'] = True