From 93bf045ce5e676a7568d3b14b175295b6ca38003 Mon Sep 17 00:00:00 2001
From: ctracey <ctracey@craigtracey.com>
Date: Tue, 15 Jan 2013 16:34:51 -0500
Subject: Fix broken cc_update_etc_hosts (LP: #1100036)

Right now, all distros but ubuntu will fail to manage /etc/hosts. This
is due to the fact that the templates are named:
- hosts.ubuntu.tmpl
- hosts.redhat.tmpl

The config handler is specifically looking for a template with the
given distro name.

This change addresses this issue and is contingent upon support of
'osfamilies' as implemented in LP: #1100029
(lp:~craigtracey/cloud-init/osfamilies)
---
 templates/hosts.debian.tmpl | 25 +++++++++++++++++++++++++
 templates/hosts.ubuntu.tmpl | 25 -------------------------
 2 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 templates/hosts.debian.tmpl
 delete mode 100644 templates/hosts.ubuntu.tmpl

(limited to 'templates')

diff --git a/templates/hosts.debian.tmpl b/templates/hosts.debian.tmpl
new file mode 100644
index 00000000..ae120b02
--- /dev/null
+++ b/templates/hosts.debian.tmpl
@@ -0,0 +1,25 @@
+## 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
+# then you will need to either
+# a.) make changes to the master file in /etc/cloud/templates/hosts.tmpl
+# b.) change or remove the value of 'manage_etc_hosts' in
+#     /etc/cloud/cloud.cfg or cloud-config from user-data
+# 
+## 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
+::1 ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
diff --git a/templates/hosts.ubuntu.tmpl b/templates/hosts.ubuntu.tmpl
deleted file mode 100644
index ae120b02..00000000
--- a/templates/hosts.ubuntu.tmpl
+++ /dev/null
@@ -1,25 +0,0 @@
-## 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
-# then you will need to either
-# a.) make changes to the master file in /etc/cloud/templates/hosts.tmpl
-# b.) change or remove the value of 'manage_etc_hosts' in
-#     /etc/cloud/cloud.cfg or cloud-config from user-data
-# 
-## 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
-::1 ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-- 
cgit v1.2.3