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
This commit is contained in:
Garrett Holmstrom 2012-09-13 13:48:55 -07:00
parent d1b4930153
commit 4a01ffd874
2 changed files with 19 additions and 0 deletions

View File

@ -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.

View File

@ -20,6 +20,10 @@ Patch1: cloud-init-0.6.3-no-runparts.patch
Patch2: cloud-init-0.6.3-lp970071.patch Patch2: cloud-init-0.6.3-lp970071.patch
# Add support for installing packages with yum # Add support for installing packages with yum
Patch3: cloud-init-0.6.3-yum.patch 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 BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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 %patch1 -p0
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
cp -p %{SOURCE2} README.fedora cp -p %{SOURCE2} README.fedora
@ -137,6 +142,9 @@ fi
%changelog %changelog
* Thu Sep 13 2012 Garrett Holmstrom <gholms@fedoraproject.org> - 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 <rel-eng@lists.fedoraproject.org> - 0.6.3-0.4.bzr532 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.3-0.4.bzr532
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild