diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-07-24 11:04:34 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-07-24 11:04:34 -0400 |
| commit | 82397d79f1c0618f25eab6e28e65b1e59a98603a (patch) | |
| tree | 282753410e972115da387fdef471f6563b5b3379 /cloudinit/sources/__init__.py | |
| parent | eae3b6ad499b88b725a52cf07245e4721af380cf (diff) | |
| parent | 0891f6611d1c264220a6f71306802db1e70651fc (diff) | |
| download | vyos-cloud-init-82397d79f1c0618f25eab6e28e65b1e59a98603a.tar.gz vyos-cloud-init-82397d79f1c0618f25eab6e28e65b1e59a98603a.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/sources/__init__.py')
| -rw-r--r-- | cloudinit/sources/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py index d8fbacdd..974c0407 100644 --- a/cloudinit/sources/__init__.py +++ b/cloudinit/sources/__init__.py @@ -135,7 +135,8 @@ class DataSource(object): @property def availability_zone(self): - return self.metadata.get('availability-zone') + return self.metadata.get('availability-zone', + self.metadata.get('availability_zone')) def get_instance_id(self): if not self.metadata or 'instance-id' not in self.metadata: |