summaryrefslogtreecommitdiff
path: root/cloudinit/templater.py
diff options
context:
space:
mode:
authorAndrew Jorgensen <ajorgens@amazon.com>2016-06-06 09:19:10 -0700
committerAndrew Jorgensen <ajorgens@amazon.com>2016-06-06 09:19:10 -0700
commitc176089d9870f373e5876d246820fba6ff44d6c8 (patch)
treed53e47aebe0fb96ee2c95baa4b9f5b6f4d54abd5 /cloudinit/templater.py
parentbc9bd58d1533d996029770da758f73217c15af33 (diff)
downloadvyos-cloud-init-c176089d9870f373e5876d246820fba6ff44d6c8.tar.gz
vyos-cloud-init-c176089d9870f373e5876d246820fba6ff44d6c8.zip
Change the Cheetah warning to a debug message
In the absence of cheetah, which is a fairly heavy templating engine, and not strictly needed by anything in cloud-init, the only warning we saw in the logs was this one from the templater. Degrading this to a debug message makes any other warnings more relevant.
Diffstat (limited to 'cloudinit/templater.py')
-rw-r--r--cloudinit/templater.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/cloudinit/templater.py b/cloudinit/templater.py
index 8a6ad417..41ef27e3 100644
--- a/cloudinit/templater.py
+++ b/cloudinit/templater.py
@@ -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@canonical.com>
# Author: Juerg Haefliger <juerg.haefliger@hp.com>
# Author: Joshua Harlow <harlowja@yahoo-inc.com>
+# Author: Andrew Jorgensen <ajorgens@amazon.com>
#
# 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 @@ def detect_template(text):
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.")
- return ('basic', basic_render, text)
- else:
+ 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:
template_type = type_match.group(1).lower().strip()
if template_type not in ('jinja', 'cheetah', 'basic'):