summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkeyz182 <keyz182@gmail.com>2011-05-28 01:44:00 +0100
committerkeyz182 <keyz182@gmail.com>2011-05-28 01:44:00 +0100
commitf3d0fa0b4df167cbed32335eb77b7293b31e91b2 (patch)
treed53f8610a4d06a09c0f8ede8a006c793633d1d2c
parent0497869b736cf06ec07f2c584a0bc3292781b44e (diff)
downloadvyos-cloud-init-f3d0fa0b4df167cbed32335eb77b7293b31e91b2.tar.gz
vyos-cloud-init-f3d0fa0b4df167cbed32335eb77b7293b31e91b2.zip
changed config key name
-rw-r--r--cloudinit/DataSourceEc2.py2
-rw-r--r--doc/examples/cloud-config-datasources.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/DataSourceEc2.py b/cloudinit/DataSourceEc2.py
index bb0b015a..786ab78f 100644
--- a/cloudinit/DataSourceEc2.py
+++ b/cloudinit/DataSourceEc2.py
@@ -114,7 +114,7 @@ class DataSourceEc2(DataSource.DataSource):
addresslist = ["http://169.254.169.254:80", "http://instance-data:8773"]
try:
- addresslist = mcfg.get("metadata_url", addresslist)
+ addresslist = mcfg.get("metadata_urls", addresslist)
except Exception as e:
util.logexc(log)
log.warning("Failed to get metadata URLs, using defaults")
diff --git a/doc/examples/cloud-config-datasources.txt b/doc/examples/cloud-config-datasources.txt
index a625e76d..e04f8976 100644
--- a/doc/examples/cloud-config-datasources.txt
+++ b/doc/examples/cloud-config-datasources.txt
@@ -10,7 +10,7 @@ datasource:
retries : 30
#metadata_url: a list of URLs to check for metadata services
- metadata_url:
+ metadata_urls:
- http://169.254.169.254:80
- http://instance-data:8773