summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-12-09 10:47:05 -0500
committerScott Moser <smoser@ubuntu.com>2014-12-09 10:47:05 -0500
commitfa5ce8c40621c78e61c7d9bd073903101f7d6a5e (patch)
treead199a7ba6f336019546d6abc5742faf4b3fd6b5 /tools
parent9c2933d9cad323b786adc8338f045cb71cd258da (diff)
downloadvyos-cloud-init-fa5ce8c40621c78e61c7d9bd073903101f7d6a5e.tar.gz
vyos-cloud-init-fa5ce8c40621c78e61c7d9bd073903101f7d6a5e.zip
tools/ccfg-merge-debug: fix for updated user-data/vendor-data
this was broken previously when user-data and vender-data were brought together.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/ccfg-merge-debug3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/ccfg-merge-debug b/tools/ccfg-merge-debug
index 5b6b050a..85227da7 100755
--- a/tools/ccfg-merge-debug
+++ b/tools/ccfg-merge-debug
@@ -48,7 +48,7 @@ def main():
ccph.cloud_fn = outfile
c_handlers = helpers.ContentHandlers()
- c_handlers.register_defaults([ccph])
+ c_handlers.register(ccph)
called = []
for (_ctype, mod) in c_handlers.iteritems():
@@ -69,6 +69,7 @@ def main():
# to help write there contents to files with numbered
# names...
'handlercount': 0,
+ 'excluded': [],
}
handlers.walk(user_data_msg, handlers.walker_callback, data=part_data)