x/cloud-init
Code Issues Proposed changes

tools/ccfg-merge-debug: fix for updated user-data/vendor-data

Browse Source 
this was broken previously when user-data and vender-data were
brought together.
This commit is contained in:
Scott Moser 2014-12-09 10:47:05 -05:00
parent b1462e1943
commit d90bfd6268
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/ccfg-merge-debug
View File

@ -48,7 +48,7 @@ def main():
ccph.cloud_fn = outfile ccph.cloud_fn = outfile
c_handlers = helpers.ContentHandlers() c_handlers = helpers.ContentHandlers()
c_handlers.register_defaults([ccph]) c_handlers.register(ccph)
called = [] called = []
for (_ctype, mod) in c_handlers.iteritems(): for (_ctype, mod) in c_handlers.iteritems():
@ -69,6 +69,7 @@ def main():
# to help write there contents to files with numbered # to help write there contents to files with numbered
# names... # names...
'handlercount': 0, 'handlercount': 0,
'excluded': [],
} }
handlers.walk(user_data_msg, handlers.walker_callback, data=part_data) handlers.walk(user_data_msg, handlers.walker_callback, data=part_data)