From af2bf6577dc17ff85c38f76fddf6f6c7fbad992b Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Sat, 16 Jun 2012 20:03:38 -0700
Subject: Match the transform named final_msg by adding a _msg to the transform
 name.

---
 cloudinit/transforms/welcome.py     | 64 -------------------------------------
 cloudinit/transforms/welcome_msg.py | 64 +++++++++++++++++++++++++++++++++++++
 config/cloud.cfg                    |  2 +-
 3 files changed, 65 insertions(+), 65 deletions(-)
 delete mode 100644 cloudinit/transforms/welcome.py
 create mode 100644 cloudinit/transforms/welcome_msg.py

diff --git a/cloudinit/transforms/welcome.py b/cloudinit/transforms/welcome.py
deleted file mode 100644
index 04691d21..00000000
--- a/cloudinit/transforms/welcome.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2012 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#    Copyright (C) 2012 Yahoo! Inc.
-#
-#    Author: Scott Moser <scott.moser@canonical.com>
-#    Author: Juerg Haefliger <juerg.haefliger@hp.com>
-#    Author: Joshua Harlow <harlowja@yahoo-inc.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
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from cloudinit.settings import PER_ALWAYS
-
-from cloudinit import templater
-from cloudinit import util
-from cloudinit import version
-
-import sys
-
-welcome_message_def = ("Cloud-init v. {{version}} starting stage {{stage}} at "
-                       "{{timestamp}}. Up {{uptime}} seconds.")
-
-
-frequency = PER_ALWAYS
-
-
-def handle(_name, cfg, cloud, log, args):
-
-    welcome_msg = util.get_cfg_option_str(cfg, "welcome_msg")
-    if not welcome_msg:
-        tpl_fn = cloud.get_template_filename("welcome_msg")
-        if tpl_fn:
-            welcome_msg = util.load_file(tpl_fn)
-
-    if not welcome_msg:
-        welcome_msg = welcome_message_def
-
-    stage = "??"
-    if args:
-        stage = args[0]
-
-    tpl_params = {
-        'stage': stage,
-        'version': version.version_string(),
-        'uptime': util.uptime(),
-        'timestamp': util.time_rfc2822(),
-    }
-    try:
-        contents = templater.render_string(welcome_msg, tpl_params)
-        # TODO use log or sys.stderr??
-        sys.stderr.write("%s\n" % (contents))
-    except:
-        util.logexc(log, "Failed to render welcome message template")
diff --git a/cloudinit/transforms/welcome_msg.py b/cloudinit/transforms/welcome_msg.py
new file mode 100644
index 00000000..04691d21
--- /dev/null
+++ b/cloudinit/transforms/welcome_msg.py
@@ -0,0 +1,64 @@
+# vi: ts=4 expandtab
+#
+#    Copyright (C) 2012 Canonical Ltd.
+#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
+#    Copyright (C) 2012 Yahoo! Inc.
+#
+#    Author: Scott Moser <scott.moser@canonical.com>
+#    Author: Juerg Haefliger <juerg.haefliger@hp.com>
+#    Author: Joshua Harlow <harlowja@yahoo-inc.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
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from cloudinit.settings import PER_ALWAYS
+
+from cloudinit import templater
+from cloudinit import util
+from cloudinit import version
+
+import sys
+
+welcome_message_def = ("Cloud-init v. {{version}} starting stage {{stage}} at "
+                       "{{timestamp}}. Up {{uptime}} seconds.")
+
+
+frequency = PER_ALWAYS
+
+
+def handle(_name, cfg, cloud, log, args):
+
+    welcome_msg = util.get_cfg_option_str(cfg, "welcome_msg")
+    if not welcome_msg:
+        tpl_fn = cloud.get_template_filename("welcome_msg")
+        if tpl_fn:
+            welcome_msg = util.load_file(tpl_fn)
+
+    if not welcome_msg:
+        welcome_msg = welcome_message_def
+
+    stage = "??"
+    if args:
+        stage = args[0]
+
+    tpl_params = {
+        'stage': stage,
+        'version': version.version_string(),
+        'uptime': util.uptime(),
+        'timestamp': util.time_rfc2822(),
+    }
+    try:
+        contents = templater.render_string(welcome_msg, tpl_params)
+        # TODO use log or sys.stderr??
+        sys.stderr.write("%s\n" % (contents))
+    except:
+        util.logexc(log, "Failed to render welcome message template")
diff --git a/config/cloud.cfg b/config/cloud.cfg
index f1c43f2f..147e0500 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -20,7 +20,7 @@ preserve_hostname: false
 
 # The transform modules that run in the 'init' stage
 cloud_init_modules:
- - welcome
+ - welcome_msg
  - bootcmd
  - resizefs
  - set_hostname
-- 
cgit v1.2.3