From 2d1e87fb520292c6c30484ea7acad84adb0487d3 Mon Sep 17 00:00:00 2001 From: keyz182 Date: Sat, 28 May 2011 00:50:41 +0100 Subject: Added support for loading metadata urls from config files. --- doc/examples/cloud-config-datasources.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/examples/cloud-config-datasources.txt b/doc/examples/cloud-config-datasources.txt index 3333792e..a625e76d 100644 --- a/doc/examples/cloud-config-datasources.txt +++ b/doc/examples/cloud-config-datasources.txt @@ -8,3 +8,10 @@ datasource: # after each try, a sleep of int(try_number/5)+1 is done # default sleep is 30 retries : 30 + + #metadata_url: a list of URLs to check for metadata services + metadata_url: + - http://169.254.169.254:80 + - http://instance-data:8773 + + -- cgit v1.2.3 From f3d0fa0b4df167cbed32335eb77b7293b31e91b2 Mon Sep 17 00:00:00 2001 From: keyz182 Date: Sat, 28 May 2011 01:44:00 +0100 Subject: changed config key name --- cloudinit/DataSourceEc2.py | 2 +- doc/examples/cloud-config-datasources.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') 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 -- cgit v1.2.3