Revert back to using cheetah + adjust resultant code + templates

At this point there is a mixture of "double hash" cheetah comments and '#*'
cheetah comments.

4 files changed, 70 insertions, 67 deletions

diff --git a/templates/chef_client.rb.tmpl b/templates/chef_client.rb.tmpl
index 35123ced..d3d9a922 100644
--- a/templates/chef_client.rb.tmpl
+++ b/templates/chef_client.rb.tmpl
@@ -1,12 +1,12 @@
 log_level              :info
 log_location           "/var/log/chef/client.log"
 ssl_verify_mode        :verify_none
-validation_client_name "{{validation_name}}"
+validation_client_name "$validation_name"
 validation_key         "/etc/chef/validation.pem"
 client_key             "/etc/chef/client.pem"
-chef_server_url        "{{server_url}}"
-environment            "{{environment}}"
-node_name              "{{node_name}}"
+chef_server_url        "$server_url"
+environment            "$environment"
+node_name              "$node_name"
 json_attribs           "/etc/chef/firstboot.json"
 file_cache_path        "/var/cache/chef"
 file_backup_path       "/var/backups/chef"
diff --git a/templates/hosts.redhat.tmpl b/templates/hosts.redhat.tmpl
index cfc40668..80459d95 100644
--- a/templates/hosts.redhat.tmpl
+++ b/templates/hosts.redhat.tmpl
@@ -1,22 +1,23 @@
-{{# This file /etc/cloud/templates/hosts.tmpl is only utilized
+#*
+    This file /etc/cloud/templates/hosts.redhat.tmpl is only utilized
     if enabled in cloud-config.  Specifically, in order to enable it
     you need to add the following to config:
-      manage_etc_hosts: True}}
-# 
+      manage_etc_hosts: True
+*#
 # Your system has configured 'manage_etc_hosts' as True.
 # As a result, if you wish for changes to this file to persist
 # then you will need to either
-# a.) make changes to the master file in /etc/cloud/templates/hosts.tmpl
+# a.) make changes to the master file in /etc/cloud/templates/hosts.redhat.tmpl
 # b.) change or remove the value of 'manage_etc_hosts' in
 #     /etc/cloud/cloud.cfg or cloud-config from user-data
 # 
 # The following lines are desirable for IPv4 capable hosts
-127.0.0.1 {{fqdn}} {{hostname}} 
+127.0.0.1 ${fqdn} ${hostname} 
 127.0.0.1 localhost.localdomain localhost
 127.0.0.1 localhost4.localdomain4 localhost4
 
 # The following lines are desirable for IPv6 capable hosts
-::1 {{fqdn}} {{hostname}}
+::1 ${fqdn} ${hostname}
 ::1 localhost.localdomain localhost
 ::1 localhost6.localdomain6 localhost6
 
diff --git a/templates/hosts.ubuntu.tmpl b/templates/hosts.ubuntu.tmpl
index 9eebe971..ae120b02 100644
--- a/templates/hosts.ubuntu.tmpl
+++ b/templates/hosts.ubuntu.tmpl
@@ -1,7 +1,9 @@
-{{# This file /etc/cloud/templates/hosts.tmpl is only utilized
-    if enabled in cloud-config.  Specifically, in order to enable it
-    you need to add the following to config:
-      manage_etc_hosts: True}}
+## This file (/etc/cloud/templates/hosts.tmpl) is only utilized
+## if enabled in cloud-config.  Specifically, in order to enable it
+## you need to add the following to config:
+##    manage_etc_hosts: True
+##
+## Note, double-hash commented lines will not appear in /etc/hosts
 # 
 # Your system has configured 'manage_etc_hosts' as True.
 # As a result, if you wish for changes to this file to persist
@@ -10,8 +12,8 @@
 # b.) change or remove the value of 'manage_etc_hosts' in
 #     /etc/cloud/cloud.cfg or cloud-config from user-data
 # 
-# The following lines are desirable for IPv4 capable hosts
-127.0.1.1 {{fqdn}} {{hostname}}
+## The value '$hostname' will be replaced with the local-hostname
+127.0.1.1 $fqdn $hostname
 127.0.0.1 localhost
 
 # The following lines are desirable for IPv6 capable hosts
@@ -21,4 +23,3 @@ ff00::0 ip6-mcastprefix
 ff02::1 ip6-allnodes
 ff02::2 ip6-allrouters
 ff02::3 ip6-allhosts
-
diff --git a/templates/sources.list.tmpl b/templates/sources.list.tmpl
index 8acbd7d5..f702025f 100644
--- a/templates/sources.list.tmpl
+++ b/templates/sources.list.tmpl
@@ -1,59 +1,60 @@
-# Note, this file is written by cloud-init on first boot of an instance
-# modifications made here will not survive a re-bundle.
-# if you wish to make changes you can:
-# a.) add 'apt_preserve_sources_list: true' to /etc/cloud/cloud.cfg
-#     or do the same in user-data
-# b.) add sources in /etc/apt/sources.list.d
-# c.) make changes to template file /etc/cloud/templates/sources.list.tmpl
+\## Note, this file is written by cloud-init on first boot of an instance
+\## modifications made here will not survive a re-bundle.
+\## if you wish to make changes you can:
+\## a.) add 'apt_preserve_sources_list: true' to /etc/cloud/cloud.cfg
+\##     or do the same in user-data
+\## b.) add sources in /etc/apt/sources.list.d
+\## c.) make changes to template file /etc/cloud/templates/sources.list.tmpl
+\###
 
 # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
 # newer versions of the distribution.
-deb {{mirror}} {{codename}} main
-deb-src {{mirror}} {{codename}} main
+deb $mirror $codename main
+deb-src $mirror $codename main
 
-# Major bug fix updates produced after the final release of the
-# distribution.
-deb {{mirror}} {{codename}}-updates main
-deb-src {{mirror}} {{codename}}-updates main
+\## Major bug fix updates produced after the final release of the
+\## distribution.
+deb $mirror $codename-updates main
+deb-src $mirror $codename-updates main
 
-# N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-# team. Also, please note that software in universe WILL NOT receive any
-# review or updates from the Ubuntu security team.
-deb {{mirror}} {{codename}} universe
-deb-src {{mirror}} {{codename}} universe
-deb {{mirror}} {{codename}}-updates universe
-deb-src {{mirror}} {{codename}}-updates universe
+\## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+\## team. Also, please note that software in universe WILL NOT receive any
+\## review or updates from the Ubuntu security team.
+deb $mirror $codename universe
+deb-src $mirror $codename universe
+deb $mirror $codename-updates universe
+deb-src $mirror $codename-updates universe
 
-# N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu 
-# team, and may not be under a free licence. Please satisfy yourself as to
-# your rights to use the software. Also, please note that software in 
-# multiverse WILL NOT receive any review or updates from the Ubuntu
-# security team.
-# deb {{mirror}} {{codename}} multiverse
-# deb-src {{mirror}} {{codename}} multiverse
-# deb {{mirror}} {{codename}}-updates multiverse
-# deb-src {{mirror}} {{codename}}-updates multiverse
+\## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu 
+\## team, and may not be under a free licence. Please satisfy yourself as to
+\## your rights to use the software. Also, please note that software in 
+\## multiverse WILL NOT receive any review or updates from the Ubuntu
+\## security team.
+# deb $mirror $codename multiverse
+# deb-src $mirror $codename multiverse
+# deb $mirror $codename-updates multiverse
+# deb-src $mirror $codename-updates multiverse
 
-# Uncomment the following two lines to add software from the 'backports'
-# repository.
-# N.B. software from this repository may not have been tested as
-# extensively as that contained in the main release, although it includes
-# newer versions of some applications which may provide useful features.
-# Also, please note that software in backports WILL NOT receive any review
-# or updates from the Ubuntu security team.
-# deb {{mirror}} {{codename}}-backports main restricted universe multiverse
-# deb-src {{mirror}} {{codename}}-backports main restricted universe multiverse
+\## Uncomment the following two lines to add software from the 'backports'
+\## repository.
+\## N.B. software from this repository may not have been tested as
+\## extensively as that contained in the main release, although it includes
+\## newer versions of some applications which may provide useful features.
+\## Also, please note that software in backports WILL NOT receive any review
+\## or updates from the Ubuntu security team.
+# deb $mirror $codename-backports main restricted universe multiverse
+# deb-src $mirror $codename-backports main restricted universe multiverse
 
-# Uncomment the following two lines to add software from Canonical's
-# 'partner' repository.
-# This software is not part of Ubuntu, but is offered by Canonical and the
-# respective vendors as a service to Ubuntu users.
-# deb http://archive.canonical.com/ubuntu {{codename}} partner
-# deb-src http://archive.canonical.com/ubuntu {{codename}} partner
+\## Uncomment the following two lines to add software from Canonical's
+\## 'partner' repository.
+\## This software is not part of Ubuntu, but is offered by Canonical and the
+\## respective vendors as a service to Ubuntu users.
+# deb http://archive.canonical.com/ubuntu $codename partner
+# deb-src http://archive.canonical.com/ubuntu $codename partner
 
-deb http://security.ubuntu.com/ubuntu {{codename}}-security main
-deb-src http://security.ubuntu.com/ubuntu {{codename}}-security main
-deb http://security.ubuntu.com/ubuntu {{codename}}-security universe
-deb-src http://security.ubuntu.com/ubuntu {{codename}}-security universe
-# deb http://security.ubuntu.com/ubuntu {{codename}}-security multiverse
-# deb-src http://security.ubuntu.com/ubuntu {{codename}}-security multiverse
+deb http://security.ubuntu.com/ubuntu $codename-security main
+deb-src http://security.ubuntu.com/ubuntu $codename-security main
+deb http://security.ubuntu.com/ubuntu $codename-security universe
+deb-src http://security.ubuntu.com/ubuntu $codename-security universe
+# deb http://security.ubuntu.com/ubuntu $codename-security multiverse
+# deb-src http://security.ubuntu.com/ubuntu $codename-security multiverse