[cloud-init/f16] Fix IP-based hostname generation

[gholms]

commit 9adeb5816f9aac7d56d208a63dfbea17cdd28a61
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue Sep 18 11:56:05 2012 -0700

    Fix IP-based hostname generation
    
    https://bugzilla.redhat.com/show_bug.cgi?id=857502
    https://bugs.launchpad.net/cloud-init/+bug/1050962
    http://bazaar.launchpad.net/~cloud-init-dev/cloud-init/trunk/revision/648

 cloud-init-0.6.3-iphost.patch |   13 +++++++++++++
 cloud-init.spec               |   11 ++++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/cloud-init-0.6.3-iphost.patch b/cloud-init-0.6.3-iphost.patch
new file mode 100644
index 0000000..2bcc76d
--- /dev/null
+++ b/cloud-init-0.6.3-iphost.patch
@@ -0,0 +1,13 @@
+Index: cloud-init-0.6.3-bzr532/cloudinit/DataSource.py
+===================================================================
+--- cloud-init-0.6.3-bzr532.orig/cloudinit/DataSource.py
++++ cloud-init-0.6.3-bzr532/cloudinit/DataSource.py
+@@ -136,7 +136,7 @@ class DataSource:
+             # make up a hostname (LP: #475354) in format ip-xx.xx.xx.xx
+             lhost = self.metadata['local-hostname']
+             if is_ipv4(lhost):
+-                toks = "ip-%s" % lhost.replace(".", "-")
++                toks = ["ip-%s" % lhost.replace(".", "-")]
+             else:
+                 toks = lhost.split(".")
+ 
diff --git a/cloud-init.spec b/cloud-init.spec
index 6dce916..fc56238 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -2,7 +2,7 @@
 
 Name:           cloud-init
 Version:        0.6.3
-Release:        0.5.bzr532%{?dist}
+Release:        0.6.bzr532%{?dist}
 Summary:        Cloud instance init scripts
 
 Group:          System Environment/Base
@@ -30,6 +30,11 @@ Patch5:         cloud-init-0.6.3-systemd-timeout.patch
 # Send output to console so euca-get-console-output works
 # https://bugzilla.redhat.com/show_bug.cgi?id=854654
 Patch6:         cloud-init-0.6.3-systemd-stdout.patch
+# Fix IP-based hostname generation
+# https://bugzilla.redhat.com/show_bug.cgi?id=857502
+# https://bugs.launchpad.net/cloud-init/+bug/1050962
+# http://bazaar.launchpad.net/~cloud-init-dev/cloud-init/trunk/revision/648
+Patch7:         cloud-init-0.6.3-iphost.patch
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +74,7 @@ ssh keys and to let the user run various scripts.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 cp -p %{SOURCE2} README.fedora
 
@@ -150,6 +156,9 @@ fi
 
 
 %changelog
+* Tue Sep 18 2012 Garrett Holmstrom <gholms at fedoraproject.org> - 0.6.3-0.6.bzr532
+- Fixed IP-based hostname generation [RH:857502 LP:1050962]
+
 * Thu Sep 13 2012 Garrett Holmstrom <gholms at fedoraproject.org> - 0.6.3-0.5.bzr532
 - Use a FQDN (instance-data.) for instance data URL fallback [RH:850916 LP:1040200]
 - Shut off systemd timeouts [RH:836269]