diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-04-22 12:43:35 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-04-22 12:43:35 -0700 |
| commit | 8441fe20fdd1d8bb195bc7d354c9e87d2f446ccd (patch) | |
| tree | 10a9758005b0eb1dc2b7e89665d1acaf19621fe2 /cloudinit/handlers/cloud_config.py | |
| parent | 50f91a1bca166b5e815a722aca573672b269bacb (diff) | |
| download | vyos-cloud-init-8441fe20fdd1d8bb195bc7d354c9e87d2f446ccd.tar.gz vyos-cloud-init-8441fe20fdd1d8bb195bc7d354c9e87d2f446ccd.zip | |
Continue working on merging.
Diffstat (limited to 'cloudinit/handlers/cloud_config.py')
| -rw-r--r-- | cloudinit/handlers/cloud_config.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cloudinit/handlers/cloud_config.py b/cloudinit/handlers/cloud_config.py index 7678a5b0..2ae9b226 100644 --- a/cloudinit/handlers/cloud_config.py +++ b/cloudinit/handlers/cloud_config.py @@ -85,17 +85,16 @@ class CloudConfigPartHandler(handlers.Handler): all_mergers.extend(mergers_header) if not all_mergers: all_mergers = DEF_MERGERS - return all_mergers + return (payload_yaml, all_mergers) def _merge_part(self, payload, headers): - my_mergers = self._extract_mergers(payload, headers) + (payload_yaml, my_mergers) = self._extract_mergers(payload, headers) LOG.debug("Merging by applying %s", my_mergers) merger = mergers.construct(my_mergers) if self.cloud_buf is None: # First time through, merge with an empty dict... self.cloud_buf = {} - self.cloud_buf = merger.merge(self.cloud_buf, - util.load_yaml(payload)) + self.cloud_buf = merger.merge(self.cloud_buf, payload_yaml) def _reset(self): self.file_names = [] |