diff options
| author | Joshua Harlow <harlowja@gmail.com> | 2013-07-24 11:10:17 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-07-24 11:10:17 -0400 |
| commit | 2939f498f51025ebd0c9bdf302b578dfcbf54d0c (patch) | |
| tree | f5be8769f8de4a40935c29f5d8eb3b7422032f93 /cloudinit/handlers/__init__.py | |
| parent | 0891f6611d1c264220a6f71306802db1e70651fc (diff) | |
| parent | 97b19f3b1992e56ef8e1a055fbe64a19d1eacfbf (diff) | |
| download | vyos-cloud-init-2939f498f51025ebd0c9bdf302b578dfcbf54d0c.tar.gz vyos-cloud-init-2939f498f51025ebd0c9bdf302b578dfcbf54d0c.zip | |
Add support for merging via jsonp patch format.
This adds a very well defined and understood mechanism for applying changes to
the cloud-config. Had we seen this previously, we might have not done the
merge-types work.
Diffstat (limited to 'cloudinit/handlers/__init__.py')
| -rw-r--r-- | cloudinit/handlers/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cloudinit/handlers/__init__.py b/cloudinit/handlers/__init__.py index 1d450061..2ddc75f4 100644 --- a/cloudinit/handlers/__init__.py +++ b/cloudinit/handlers/__init__.py @@ -62,6 +62,7 @@ INCLUSION_TYPES_MAP = { '#part-handler': 'text/part-handler', '#cloud-boothook': 'text/cloud-boothook', '#cloud-config-archive': 'text/cloud-config-archive', + '#cloud-config-jsonp': 'text/cloud-config-jsonp', } # Sorted longest first |