cloud-init-dev team mailing list archive

[Andrew Jorgensen <ajorgens@xxxxxxxxxx>]

Andrew Jorgensen has proposed merging lp:~ajorgens/cloud-init/cheetah-warnings into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~ajorgens/cloud-init/cheetah-warnings/+merge/296579

This was the only warning on our systems, and it didn't seem to need to be a warning.
-- 
Your team cloud init development team is requested to review the proposed merge of lp:~ajorgens/cloud-init/cheetah-warnings into lp:cloud-init.

=== modified file 'cloudinit/templater.py'
--- cloudinit/templater.py	2016-05-12 13:51:21 +0000
+++ cloudinit/templater.py	2016-06-06 16:27:09 +0000
@@ -3,10 +3,12 @@
 #    Copyright (C) 2012 Canonical Ltd.
 #    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
 #    Copyright (C) 2012 Yahoo! Inc.
+#    Copyright (C) 2016 Amazon.com, Inc. or its affiliates.
 #
 #    Author: Scott Moser <scott.moser@xxxxxxxxxxxxx>
 #    Author: Juerg Haefliger <juerg.haefliger@xxxxxx>
 #    Author: Joshua Harlow <harlowja@xxxxxxxxxxxxx>
+#    Author: Andrew Jorgensen <ajorgens@xxxxxxxxxx>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License version 3, as
@@ -102,12 +104,11 @@
         rest = ''
     type_match = TYPE_MATCHER.match(ident)
     if not type_match:
-        if not CHEETAH_AVAILABLE:
-            LOG.warn("Cheetah not available as the default renderer for"
-                     " unknown template, reverting to the basic renderer.")
+        if CHEETAH_AVAILABLE:
+            LOG.debug("Using Cheetah as the renderer for unknown template.")
+            return ('cheetah', cheetah_render, text)
+        else:
             return ('basic', basic_render, text)
-        else:
-            return ('cheetah', cheetah_render, text)
     else:
         template_type = type_match.group(1).lower().strip()
         if template_type not in ('jinja', 'cheetah', 'basic'):