rpm/cloud-init
SHA256
1
0
Fork 0
forked from pool/cloud-init
Code Pull Requests Activity

Accepting request 646077 from Cloud:Tools

Browse Source 
- Add cloud-init-ostack-metadat-dencode.patch (bsc#1101894)

- Add cloud-init-static-net.patch (boo#1114160)

OBS-URL: https://build.opensuse.org/request/show/646077
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cloud-init?expand=0&rev=54
This commit is contained in:
Dominique Leuenberger 2018-11-05 21:54:45 +00:00 committed by Git OBS Bridge
commit d8c0fcb2ba
4 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cloud-init-ostack-metadat-dencode.patch Normal file
View File

@ -0,0 +1,14 @@
--- 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)

12
cloud-init-static-net.patch Normal file
View File

@ -0,0 +1,12 @@
--- 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

10
cloud-init.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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)
-------------------------------------------------------------------
Thu Oct 25 18:56:13 UTC 2018 - Robert Schweikert <rjschwei@suse.com>

8
cloud-init.spec
View File

@ -48,7 +48,11 @@ Patch38: cloud-init-sysconf-path.patch
Patch39: cloud-init-sysconf-ethsetup.patch
# FIXME (lp#1799709)
# https://code.launchpad.net/~rjschwei/cloud-init/+git/cloud-init/+merge/357752
Patch40: 0001-Fix-the-service-order-for-SUSE-distributions.patch
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 @@ Documentation and examples for cloud-init tools
%patch38
%patch39 -p1
%patch40 -p1
%patch41
%patch42
%build
%if 0%{?suse_version} && 0%{?suse_version} <= 1315