summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2012-10-23 15:56:29 +0200
committerScott Moser <smoser@brickies.net>2012-10-23 15:56:29 +0200
commit43d46a36bd3c626317aa13aca15f0a0c639777b5 (patch)
tree554fe5cd8393cda3cb132e62f440fde63652867b
parent0421d502e903f3c3ece767be57df7c27323241a0 (diff)
parente59ce224c45191a0ecceb113c9e5b8e6d9dcdab1 (diff)
downloadvyos-cloud-init-43d46a36bd3c626317aa13aca15f0a0c639777b5.tar.gz
vyos-cloud-init-43d46a36bd3c626317aa13aca15f0a0c639777b5.zip
multipart or cloud-config-archive, do not fail on unknown headers
LP: #1065116
-rw-r--r--ChangeLog2
-rw-r--r--cloudinit/user_data.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a47a5e2d..d03c0293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
- landscape: install landscape-client package if not installed.
only take action if cloud-config is present (LP: #1066115)
- cc_landscape: restart landscape after install or config (LP: #1070345)
+ - multipart/archive. do not fail on unknown headers in multipart
+ mime or cloud-archive config (LP: #1065116).
0.7.0:
- add a 'exception_cb' argument to 'wait_for_url'. If provided, this
method will be called back with the exception received and the message.
diff --git a/cloudinit/user_data.py b/cloudinit/user_data.py
index 803ffc3a..58827e3d 100644
--- a/cloudinit/user_data.py
+++ b/cloudinit/user_data.py
@@ -224,7 +224,7 @@ class UserDataProcessor(object):
for header in list(ent.keys()):
if header in ('content', 'filename', 'type', 'launch-index'):
continue
- msg.add_header(header, ent['header'])
+ msg.add_header(header, ent[header])
self._attach_part(append_msg, msg)