summaryrefslogtreecommitdiff
path: root/cloudinit/handlers/cloud_config.py
AgeCommit message (Collapse)Author
2013-07-24Fix small prefix bug + jsonp tests.Joshua Harlow
Fix the wrong usage of the prefix removal array action by just using the new util function that does these actions correctly. Add in a couple of unit tests to verify the jsonp merging and usage works as expected.
2013-07-24rename CC_JSONP_PRE again (JSONP_PREFIX) and use CLOUD_PREFIXScott Moser
2013-07-24change 'json-patch' to 'cloud-config-jsonp'Scott Moser
2013-07-24merge from trunkScott Moser
2013-07-21Use constants for repeated type strings.Joshua Harlow
2013-07-20Ensure we remove the same way we detect.Joshua Harlow
2013-07-20Remove json-patch inclusion header if payload contains it.Joshua Harlow
2013-07-20Fix constant move.Joshua Harlow
2013-07-20Fix content-type constant.Joshua Harlow
2013-07-20Add usage of '#json-patch'Joshua Harlow
2013-07-19Add the ability to merge with jsonpatch.Joshua Harlow
Jsonpatch is a new RFC standard for merging json-like structures which the cloud-init cloud-config is one such structure. To use this in a limited fashion (to start) add the ability for the cloud-config handler to accept this content-type and use it as an alternate way to merge new cloud-config sections into the accumulated cloud-config. LP: #1200476
2013-05-09Adjust comment on why we are merging cloud config the way we are.Joshua Harlow
2013-05-09Fix the cloud config merging so that it is backwards compat.Joshua Harlow
The new change for merging works well in the mergedict case but the default merging type for cloud config needs to reflect how yaml was loaded in bulk, which is the same as the replacing keys merging type that is now provided.
2013-04-22Continue working on merging.Joshua Harlow
2013-04-17Altering the order of merging.Joshua Harlow
2013-03-07more pep8/pylint. all clean nowScott Moser
2013-03-06Continue working on merging code.Joshua Harlow
2013-03-05Add in a bunch of changes and tests.Joshua Harlow
2012-11-22Allow mergers to take options.Joshua Harlow
2012-11-22Add which files the yaml blob came from.Joshua Harlow
2012-11-22Adjust naming and exception catching.Joshua Harlow
2012-11-22Change the yaml merge header extraction to be in a sep. function that can ↵Joshua Harlow
look in more places.
2012-11-22Continue work.Joshua Harlow
2012-11-22Select merge-type from either header or content after loading as yaml.Joshua Harlow
2012-11-22Continue working on merging prototype.Joshua Harlow
2012-11-20Start allowing different merging types to be appliedJoshua Harlow
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.
2012-06-16Make the top level __init__ similar to the other top level __inits__ where ↵Joshua Harlow
just util functions and base classes are defined there.
2012-06-15Fixups to ensure that pylint does not find anything major wrong.Joshua Harlow
2012-06-15Moved the user_data directory back to a user_data.py and made a handler ↵Joshua Harlow
subdir for just the internal handlers.