summaryrefslogtreecommitdiff
path: root/cloudinit/DataSourceEc2.py
diff options
context:
space:
mode:
authorkeyz182 <keyz182@gmail.com>2011-05-24 12:47:52 +0100
committerkeyz182 <keyz182@gmail.com>2011-05-24 12:47:52 +0100
commit707a01fb1af5c8c493b021b782d73d01cd018ae4 (patch)
treeddfd936a866c27eac7436817de411d2d76713534 /cloudinit/DataSourceEc2.py
parent2c20e675de5c7f840b75f023bf65802fa010fd37 (diff)
downloadvyos-cloud-init-707a01fb1af5c8c493b021b782d73d01cd018ae4.tar.gz
vyos-cloud-init-707a01fb1af5c8c493b021b782d73d01cd018ae4.zip
Modified cloudinit/DataSourceEc2.py and cloudinit/boto_utils.py to check both http://169.254.169.254 and http://instance-data:8773 for meta data service.
LP: #761847
Diffstat (limited to 'cloudinit/DataSourceEc2.py')
-rw-r--r--cloudinit/DataSourceEc2.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/DataSourceEc2.py b/cloudinit/DataSourceEc2.py
index 289fa425..38284463 100644
--- a/cloudinit/DataSourceEc2.py
+++ b/cloudinit/DataSourceEc2.py
@@ -101,7 +101,7 @@ class DataSourceEc2(DataSource.DataSource):
log.warn("Failed to get timeout, using %s" % timeout)
sleeptime = 1
- addresslist = ['169.254.169.254', "instance-data"]
+ addresslist = ['169.254.169.254', "instance-data:8773"]
starttime = time.time()
for x in range(sleeps):