diff options
| author | keyz182 <keyz182@gmail.com> | 2011-05-24 12:46:34 +0100 |
|---|---|---|
| committer | keyz182 <keyz182@gmail.com> | 2011-05-24 12:46:34 +0100 |
| commit | 2c20e675de5c7f840b75f023bf65802fa010fd37 (patch) | |
| tree | 818f2ca7ff2c7fa59154986a38b09b06cb183d40 /cloudinit/boto_utils.py | |
| parent | f613aba32e7652a27f744d27c2d000831723023c (diff) | |
| download | vyos-cloud-init-2c20e675de5c7f840b75f023bf65802fa010fd37.tar.gz vyos-cloud-init-2c20e675de5c7f840b75f023bf65802fa010fd37.zip | |
Modified cloudinit/DataSourceEc2.py and cloudinit/boto_utils.py to check both http://169.254.169.254 and http://instance-data:8773 for meta data service.
LP: #761847
Diffstat (limited to 'cloudinit/boto_utils.py')
| -rw-r--r-- | cloudinit/boto_utils.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/boto_utils.py b/cloudinit/boto_utils.py index b38483fa..8eb7a575 100644 --- a/cloudinit/boto_utils.py +++ b/cloudinit/boto_utils.py @@ -60,7 +60,7 @@ def retry_url(url, retry_on_404=True): sys.stderr.write('Caught exception reading instance data, giving up\n') return '' -def get_instance_metadata(version='latest'): +def get_instance_metadata(url='169.254.169.254',version='latest'): """ Returns the instance metadata as a nested Python dictionary. Simple values (e.g. local_hostname, hostname, etc.) will be @@ -68,11 +68,11 @@ def get_instance_metadata(version='latest'): be stored in the dict as a list of string values. More complex fields such as public-keys and will be stored as nested dicts. """ - url = 'http://169.254.169.254/%s/meta-data/' % version + url = 'http://%s/%s/meta-data/' % (url,version) return _get_instance_metadata(url) -def get_instance_userdata(version='latest', sep=None): - url = 'http://169.254.169.254/%s/user-data' % version +def get_instance_userdata(url='169.254.169.254',version='latest', sep=None): + url = 'http://%s/%s/user-data' % (url,version) user_data = retry_url(url, retry_on_404=False) if user_data: if sep: |