← Back to branch summary

~smoser/ubuntu/trusty/cloud-init/trusty-1461242

« back to all changes in this revision

Viewing changes to cloudinit/ec2_utils.py

  • Committer: Scott Moser
  • Author(s): Daniel Watkins
  • Date: 2015-03-11 16:57:10 UTC
  • Revision ID: smoser@ubuntu.com-20150311165710-eaqpciuxknmffrtv
Tags: 0.7.5-0ubuntu1.5
https://launchpad.net/bugs/1422388
https://launchpad.net/bugs/1356855
* Backport support for fetching passwords in CloudStack (LP: #1422388).
* Fix CloudStack metadata retrieval (LP: #1356855).

Show diffs side-by-side

added added

removed removed

Lines of Context:
cloudinit/ec2_utils.py
166
166
                          metadata_address='http://169.254.169.254',
167
167
                          ssl_details=None, timeout=5, retries=5):
168
168
    md_url = url_helper.combine_url(metadata_address, api_version)
169
 
    md_url = url_helper.combine_url(md_url, 'meta-data')
 
169
    # Note, 'meta-data' explicitly has trailing /.
 
170
    # this is required for CloudStack (LP: #1356855)
 
171
    md_url = url_helper.combine_url(md_url, 'meta-data/')
170
172
    caller = functools.partial(util.read_file_or_url,
171
173
                               ssl_details=ssl_details, timeout=timeout,
172
174
                               retries=retries)