When a handler version is set but to an unknown non-int convertable value, treat it as 1

1 files changed, 10 insertions, 3 deletions

diff --git a/cloudinit/handlers/__init__.py b/cloudinit/handlers/__init__.py
index afa9ec3b..156e228d 100644
--- a/cloudinit/handlers/__init__.py
+++ b/cloudinit/handlers/__init__.py
@@ -98,11 +98,18 @@ def run_part(mod, data, ctype, filename, payload, frequency):
             (frequency == PER_INSTANCE and mod_freq == PER_INSTANCE)):
         return
     mod_ver = mod.handler_version
+    # Sanity checks on version (should be an int convertable)
     try:
-        if mod_ver == 1:
-            mod.handle_part(data, ctype, filename, payload)
-        else:
+        mod_ver = int(mod_ver)
+    except:
+        mod_ver = None
+    try:
+        if mod_ver and mod_ver >= 2:
+            # Treat as v. 2 which does get a frequency
             mod.handle_part(data, ctype, filename, payload, frequency)
+        else:
+            # Treat as v. 1 which gets no frequency
+            mod.handle_part(data, ctype, filename, payload)
     except:
         util.logexc(LOG, ("Failed calling handler %s (%s, %s, %s)"
                          " with frequency %s"),