diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-08-31 17:01:51 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-08-31 17:01:51 -0700 |
| commit | aae54b5e8e1aee908b01050aa6c9c821fe94195e (patch) | |
| tree | adb163ae9d260c05ed9ff205972746f8b0e0b6ae /cloudinit/user_data.py | |
| parent | 27118e7406237510ca56e969aa1b6d9152c8afbf (diff) | |
| download | vyos-cloud-init-aae54b5e8e1aee908b01050aa6c9c821fe94195e.tar.gz vyos-cloud-init-aae54b5e8e1aee908b01050aa6c9c821fe94195e.zip | |
Don't look into cloud-archive (after processing) for launch
indexes (since they will be handled beforehand) and fix
the types being checked on the root of the archive format
to be a tuple instead of a list (which oddly causes complaints).
Diffstat (limited to 'cloudinit/user_data.py')
| -rw-r--r-- | cloudinit/user_data.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/user_data.py b/cloudinit/user_data.py index 5d550e1d..f9f84030 100644 --- a/cloudinit/user_data.py +++ b/cloudinit/user_data.py @@ -54,7 +54,7 @@ ATTACHMENT_FIELD = 'Number-Attachments' # Only the following content types can have there launch index examined # in there payload, evey other content type can still provide a header -EXAMINE_FOR_LAUNCH_INDEX = ["text/cloud-config", "text/cloud-config-archive"] +EXAMINE_FOR_LAUNCH_INDEX = ["text/cloud-config"] class UserDataProcessor(object): @@ -180,7 +180,7 @@ class UserDataProcessor(object): self._process_msg(new_msg, append_msg) def _explode_archive(self, archive, append_msg): - entries = util.load_yaml(archive, default=[], allowed=[list, set]) + entries = util.load_yaml(archive, default=[], allowed=(list, set)) for ent in entries: # ent can be one of: # dict { 'filename' : 'value', 'content' : |