diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-11-07 16:08:17 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-11-07 16:08:17 -0500 |
| commit | 1e6fc277a1c8d695c37741cc31f5ddab3d5b5600 (patch) | |
| tree | aa1fab6c241436b493700b72fc1af656ce4b7cb4 | |
| parent | 21a3cf3186809f9dae387e52e8bd9bc548981003 (diff) | |
| download | vyos-cloud-init-1e6fc277a1c8d695c37741cc31f5ddab3d5b5600.tar.gz vyos-cloud-init-1e6fc277a1c8d695c37741cc31f5ddab3d5b5600.zip | |
remove dead code from DataSourceEc2
| -rw-r--r-- | cloudinit/sources/DataSourceEc2.py | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py index 3686fa10..cff50669 100644 --- a/cloudinit/sources/DataSourceEc2.py +++ b/cloudinit/sources/DataSourceEc2.py @@ -86,9 +86,6 @@ class DataSourceEc2(sources.DataSource): def get_instance_id(self): return self.metadata['instance-id'] - def get_availability_zone(self): - return self.metadata['placement']['availability-zone'] - def _get_url_settings(self): mcfg = self.ds_cfg if not mcfg: @@ -198,19 +195,6 @@ class DataSourceEc2(sources.DataSource): return None return ofound - def is_vpc(self): - # See: https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/615545 - # Detect that the machine was launched in a VPC. - # But I did notice that when in a VPC, meta-data - # does not have public-ipv4 and public-hostname - # listed as a possibility. - ph = "public-hostname" - p4 = "public-ipv4" - if ((ph not in self.metadata or self.metadata[ph] == "") and - (p4 not in self.metadata or self.metadata[p4] == "")): - return True - return False - @property def availability_zone(self): try: |