diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-07-27 16:53:50 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-07-27 16:53:50 -0400 |
| commit | 81a9f17a71f9cac4c78ea5ce80b4a96e3bbb9324 (patch) | |
| tree | ed9b2fe43f65d2e8fc705020d7cdd4c6307b8988 /cloudinit/sources/__init__.py | |
| parent | 22cb92421234c31b783ed9df01439c734535ba01 (diff) | |
| parent | d68b340f8a6abf40f4d5cb546c91122c8856aa83 (diff) | |
| download | vyos-cloud-init-81a9f17a71f9cac4c78ea5ce80b4a96e3bbb9324.tar.gz vyos-cloud-init-81a9f17a71f9cac4c78ea5ce80b4a96e3bbb9324.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/sources/__init__.py')
| -rw-r--r-- | cloudinit/sources/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py index 39eab51b..a21c08c2 100644 --- a/cloudinit/sources/__init__.py +++ b/cloudinit/sources/__init__.py @@ -157,6 +157,10 @@ class DataSource(object): return self.metadata.get('availability-zone', self.metadata.get('availability_zone')) + @property + def region(self): + return self.metadata.get('region') + def get_instance_id(self): if not self.metadata or 'instance-id' not in self.metadata: # Return a magic not really instance id string @@ -210,8 +214,7 @@ class DataSource(object): return hostname def get_package_mirror_info(self): - return self.distro.get_package_mirror_info( - availability_zone=self.availability_zone) + return self.distro.get_package_mirror_info(data_source=self) def normalize_pubkey_data(pubkey_data): |