summaryrefslogtreecommitdiff
path: root/cloudinit/sources/DataSourceEc2.py
diff options
context:
space:
mode:
authorkaihuan.pkh <kaihuan.pkh@alibaba-inc.com>2016-10-13 20:31:49 +0800
committerScott Moser <smoser@brickies.net>2016-11-01 08:39:53 -0400
commit4f8ceffb2e3a9feefcb718bda7a7f0f21ef7ab7c (patch)
treec168b5f10d9d6284f36a2ca0754fd56fecebc5f9 /cloudinit/sources/DataSourceEc2.py
parentc12f4dd835077e3aa39e9056c25f136ff6a6655b (diff)
downloadvyos-cloud-init-4f8ceffb2e3a9feefcb718bda7a7f0f21ef7ab7c.tar.gz
vyos-cloud-init-4f8ceffb2e3a9feefcb718bda7a7f0f21ef7ab7c.zip
AliYun: Add new datasource for Ali-Cloud ECS
Support AliYun(Ali-Cloud ECS). This datasource inherits from EC2, the main difference is the meta-server address is changed to 100.100.100.200. The datasource behaves similarly to EC2 and relies on network polling. As such, it is not enabled by default.
Diffstat (limited to 'cloudinit/sources/DataSourceEc2.py')
-rw-r--r--cloudinit/sources/DataSourceEc2.py18
1 files changed, 8 insertions, 10 deletions
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
index 6fe2a0bb..bc84ef5d 100644
--- a/cloudinit/sources/DataSourceEc2.py
+++ b/cloudinit/sources/DataSourceEc2.py
@@ -31,21 +31,19 @@ from cloudinit import util
LOG = logging.getLogger(__name__)
-DEF_MD_URL = "http://169.254.169.254"
-
# Which version we are requesting of the ec2 metadata apis
DEF_MD_VERSION = '2009-04-04'
-# Default metadata urls that will be used if none are provided
-# They will be checked for 'resolveability' and some of the
-# following may be discarded if they do not resolve
-DEF_MD_URLS = [DEF_MD_URL, "http://instance-data.:8773"]
-
class DataSourceEc2(sources.DataSource):
+ # Default metadata urls that will be used if none are provided
+ # They will be checked for 'resolveability' and some of the
+ # following may be discarded if they do not resolve
+ metadata_urls = ["http://169.254.169.254", "http://instance-data.:8773"]
+
def __init__(self, sys_cfg, distro, paths):
sources.DataSource.__init__(self, sys_cfg, distro, paths)
- self.metadata_address = DEF_MD_URL
+ self.metadata_address = None
self.seed_dir = os.path.join(paths.seed_dir, "ec2")
self.api_ver = DEF_MD_VERSION
@@ -106,7 +104,7 @@ class DataSourceEc2(sources.DataSource):
return False
# Remove addresses from the list that wont resolve.
- mdurls = mcfg.get("metadata_urls", DEF_MD_URLS)
+ mdurls = mcfg.get("metadata_urls", self.metadata_urls)
filtered = [x for x in mdurls if util.is_resolvable_url(x)]
if set(filtered) != set(mdurls):
@@ -117,7 +115,7 @@ class DataSourceEc2(sources.DataSource):
mdurls = filtered
else:
LOG.warn("Empty metadata url list! using default list")
- mdurls = DEF_MD_URLS
+ mdurls = self.metadata_urls
urls = []
url2base = {}