From 4a01ffd8749c1a20b8af2204135e11096aa83e13 Mon Sep 17 00:00:00 2001 From: Garrett Holmstrom Date: Thu, 13 Sep 2012 13:48:55 -0700 Subject: [PATCH] Use a FQDN for instance data URL fallback https://bugzilla.redhat.com/show_bug.cgi?id=850916 https://bugs.launchpad.net/cloud-init/+bug/1040200 --- cloud-init-0.6.3-fqdn.patch | 11 +++++++++++ cloud-init.spec | 8 ++++++++ 2 files changed, 19 insertions(+) create mode 100644 cloud-init-0.6.3-fqdn.patch diff --git a/cloud-init-0.6.3-fqdn.patch b/cloud-init-0.6.3-fqdn.patch new file mode 100644 index 0000000..879882e --- /dev/null +++ b/cloud-init-0.6.3-fqdn.patch @@ -0,0 +1,11 @@ +--- cloud-init-0.6.3-bzr532/cloudinit/DataSourceEc2.py.fqdn 2012-03-05 11:05:34.000000000 -0800 ++++ cloud-init-0.6.3-bzr532/cloudinit/DataSourceEc2.py 2012-09-13 13:40:29.757623464 -0700 +@@ -110,7 +110,7 @@ class DataSourceEc2(DataSource.DataSourc + util.logexc(log) + log.warn("Failed to get timeout, using %s" % timeout) + +- def_mdurls = ["http://169.254.169.254", "http://instance-data:8773"] ++ def_mdurls = ["http://169.254.169.254", "http://instance-data.:8773"] + mdurls = mcfg.get("metadata_urls", def_mdurls) + + # Remove addresses from the list that wont resolve. diff --git a/cloud-init.spec b/cloud-init.spec index be528d4..95c2a9f 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -20,6 +20,10 @@ Patch1: cloud-init-0.6.3-no-runparts.patch Patch2: cloud-init-0.6.3-lp970071.patch # Add support for installing packages with yum Patch3: cloud-init-0.6.3-yum.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=850916 +# https://bugs.launchpad.net/cloud-init/+bug/1040200 +# http://bazaar.launchpad.net/~cloud-init-dev/cloud-init/trunk/revision/635 +Patch4: cloud-init-0.6.3-fqdn.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -56,6 +60,7 @@ ssh keys and to let the user run various scripts. %patch1 -p0 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cp -p %{SOURCE2} README.fedora @@ -137,6 +142,9 @@ fi %changelog +* Thu Sep 13 2012 Garrett Holmstrom - 0.6.3-0.4.bzr532 +- Use a FQDN (instance-data.) for instance data URL fallback [RH:850916 LP:1040200] + * Wed Jul 18 2012 Fedora Release Engineering - 0.6.3-0.4.bzr532 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild