summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-06-16 09:31:52 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-06-16 09:31:52 -0700
commit1b5e8117d862743f8f66cd27462965cc6c89af90 (patch)
tree318ce51ea8233bea5c79d6d680908188554eff79 /cloudinit
parentc409a80a9cb8ea2e972b085074bf54824e8e0ad2 (diff)
downloadvyos-cloud-init-1b5e8117d862743f8f66cd27462965cc6c89af90.tar.gz
vyos-cloud-init-1b5e8117d862743f8f66cd27462965cc6c89af90.zip
Rename to fixup transform/fixup handler/form transform name instead of form mod*
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/stages.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/stages.py b/cloudinit/stages.py
index 63b7cf12..9c772243 100644
--- a/cloudinit/stages.py
+++ b/cloudinit/stages.py
@@ -319,7 +319,7 @@ class Init(object):
potential_handlers = util.find_modules(cdir)
for (fname, modname) in potential_handlers.iteritems():
try:
- mod = ud.fixup_module(importer.import_module(modname))
+ mod = ud.fixup_handler(importer.import_module(modname))
types = c_handlers.register(mod)
LOG.debug("Added handler for %s from %s", types, fname)
except:
@@ -445,7 +445,7 @@ class Transforms(object):
raw_name = raw_mod['mod']
freq = raw_mod.get('freq')
run_args = raw_mod.get('args') or []
- mod_name = transforms.form_module_name(raw_name)
+ mod_name = transforms.form_transform_name(raw_name)
if not mod_name:
continue
if freq and freq not in FREQUENCIES:
@@ -453,7 +453,7 @@ class Transforms(object):
" has an unknown frequency %s"), raw_name, freq)
# Reset it so when ran it will get set to a known value
freq = None
- mod = transforms.fixup_module(importer.import_module(mod_name))
+ mod = transforms.fixup_transform(importer.import_module(mod_name))
mostly_mods.append([mod, raw_name, freq, run_args])
return mostly_mods