diff options
author | Joshua Harlow <harlowja@gmail.com> | 2012-11-20 20:02:48 -0800 |
---|---|---|
committer | Joshua Harlow <harlowja@gmail.com> | 2012-11-20 20:02:48 -0800 |
commit | 8bc85abd97e06d964bbd26208eb732e80eb87c10 (patch) | |
tree | 6cbff248cbe85d3ef26da32bc185f34edd8f5c4d /cloudinit/handlers/upstart_job.py | |
parent | d324a2cb0b10a4cd1b1b05dd23d0040ab3e9621c (diff) | |
download | vyos-cloud-init-8bc85abd97e06d964bbd26208eb732e80eb87c10.tar.gz vyos-cloud-init-8bc85abd97e06d964bbd26208eb732e80eb87c10.zip |
Start allowing different merging types to be applied
After user data handling splits apart all the different
content types into there various mime messages it is
nice to be able to have each message specify how it should
be merged (mainly for cloud-config or cloud-archive) into
the single cloud config that is eventually used. This
starts to add a plugable merging framework and the
needed components to activate said headers and merging.
Diffstat (limited to 'cloudinit/handlers/upstart_job.py')
-rw-r--r-- | cloudinit/handlers/upstart_job.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/handlers/upstart_job.py b/cloudinit/handlers/upstart_job.py index 99e0afde..a5cb9b0c 100644 --- a/cloudinit/handlers/upstart_job.py +++ b/cloudinit/handlers/upstart_job.py @@ -42,7 +42,7 @@ class UpstartJobPartHandler(handlers.Handler): handlers.type_from_starts_with("#upstart-job"), ] - def _handle_part(self, _data, ctype, filename, payload, frequency): + def handle_part(self, _data, ctype, filename, payload, frequency): if ctype in handlers.CONTENT_SIGNALS: return |