From 75af023c864d1b6c4e48788b1b4cf7aad5eb2204 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Mon, 9 Jul 2012 16:41:45 -0400
Subject: Revert back to using cheetah + adjust resultant code + templates

At this point there is a mixture of "double hash" cheetah comments and '#*'
cheetah comments.
---
 cloudinit/config/cc_final_message.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'cloudinit/config/cc_final_message.py')

diff --git a/cloudinit/config/cc_final_message.py b/cloudinit/config/cc_final_message.py
index b1caca47..3865332f 100644
--- a/cloudinit/config/cc_final_message.py
+++ b/cloudinit/config/cc_final_message.py
@@ -26,23 +26,20 @@ from cloudinit.settings import PER_ALWAYS
 
 frequency = PER_ALWAYS
 
-FINAL_MESSAGE_DEF = ("Cloud-init v. {{version}} finished at {{timestamp}}."
-                     " Up {{uptime}} seconds.")
+# Cheetah formated default message
+FINAL_MESSAGE_DEF = ("Cloud-init v. ${version} finished at ${timestamp}."
+                     " Up ${uptime} seconds.")
 
 
 def handle(_name, cfg, cloud, log, args):
 
-    msg_in = None
+    msg_in = ''
     if len(args) != 0:
-        msg_in = args[0]
+        msg_in = str(args[0])
     else:
-        msg_in = util.get_cfg_option_str(cfg, "final_message")
-
-    if not msg_in:
-        template_fn = cloud.get_template_filename('final_message')
-        if template_fn:
-            msg_in = util.load_file(template_fn)
+        msg_in = util.get_cfg_option_str(cfg, "final_message". msg_in)
 
+    msg_in = msg_in.strip()
     if not msg_in:
         msg_in = FINAL_MESSAGE_DEF
 
-- 
cgit v1.2.3