diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-08-22 16:36:32 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-08-22 16:36:32 -0400 |
| commit | ba20ec431aa9275423d2e09154f5befb8961373b (patch) | |
| tree | a5b7cad4967b208815ac8b0cabfa589e0a0354d4 /cloudinit/ec2_utils.py | |
| parent | f181c7cbdc08222f195fa84a379f35a456d26123 (diff) | |
| parent | d723c17b7abe5263d879d748dade763034cce476 (diff) | |
| download | vyos-cloud-init-ba20ec431aa9275423d2e09154f5befb8961373b.tar.gz vyos-cloud-init-ba20ec431aa9275423d2e09154f5befb8961373b.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/ec2_utils.py')
| -rw-r--r-- | cloudinit/ec2_utils.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cloudinit/ec2_utils.py b/cloudinit/ec2_utils.py index a7c9c9ab..0c751140 100644 --- a/cloudinit/ec2_utils.py +++ b/cloudinit/ec2_utils.py @@ -166,7 +166,9 @@ def get_instance_metadata(api_version='latest', metadata_address='http://169.254.169.254', ssl_details=None, timeout=5, retries=5): md_url = url_helper.combine_url(metadata_address, api_version) - md_url = url_helper.combine_url(md_url, 'meta-data') + # Note, 'meta-data' explicitly has trailing /. + # this is required for CloudStack (LP: #1356855) + md_url = url_helper.combine_url(md_url, 'meta-data/') caller = functools.partial(util.read_file_or_url, ssl_details=ssl_details, timeout=timeout, retries=retries) |