diff options
| author | Jeremy Edwards <jeremyedwards@google.com> | 2014-06-02 14:50:06 -0700 |
|---|---|---|
| committer | Jeremy Edwards <jeremyedwards@google.com> | 2014-06-02 14:50:06 -0700 |
| commit | b8c1d85521cfabe215db8de3dc2ffe68c7c4794c (patch) | |
| tree | 51feeb162b1372679394d7f59f183457874089df | |
| parent | 4ea8499fe23bf22296640332a228577fa71f4d05 (diff) | |
| download | google-compute-image-packages-b8c1d85521cfabe215db8de3dc2ffe68c7c4794c.tar.gz | |
Update http header for retrieving instance metadata.
4 files changed, 4 insertions, 4 deletions
diff --git a/google-daemon/usr/share/google/google_daemon/address_manager.py b/google-daemon/usr/share/google/google_daemon/address_manager.py index 71f8dd0..c9ff9c9 100644 --- a/google-daemon/usr/share/google/google_daemon/address_manager.py +++ b/google-daemon/usr/share/google/google_daemon/address_manager.py @@ -89,7 +89,7 @@ class AddressManager(object): # 70 seconds. url = PUBLIC_ENDPOINT_URL_PREFIX + self.last_etag request = urllib2.Request(url) - request.add_unredirected_header('X-Google-Metadata-Request', 'True') + request.add_unredirected_header('Metadata-Flavor', 'Google') u = self.urllib2.urlopen(request, timeout=70) addrs_data = u.read() headers = u.info().dict diff --git a/google-daemon/usr/share/google/google_daemon/desired_accounts.py b/google-daemon/usr/share/google/google_daemon/desired_accounts.py index 51438e0..4ef314e 100755 --- a/google-daemon/usr/share/google/google_daemon/desired_accounts.py +++ b/google-daemon/usr/share/google/google_daemon/desired_accounts.py @@ -72,7 +72,7 @@ class DesiredAccounts(object): request_url = url % wait_for_change_query logging.debug('Getting url: %s', request_url) request = urllib2.Request(request_url) - request.add_header('X-Google-Metadata-Request', 'True') + request.add_header('Metadata-Flavor', 'Google') return self.urllib2.urlopen(request) def _GetAttribute(self, diff --git a/google-startup-scripts/usr/share/google/boto/boot_setup.py b/google-startup-scripts/usr/share/google/boto/boot_setup.py index ed8d7b3..e9f3924 100755 --- a/google-startup-scripts/usr/share/google/boto/boot_setup.py +++ b/google-startup-scripts/usr/share/google/boto/boot_setup.py @@ -40,7 +40,7 @@ def GetNumericProjectId(): """Get the numeric project ID for this VM.""" try: request = urllib2.Request(NUMERIC_PROJECT_ID_URL) - request.add_unredirected_header('X-Google-Metadata-Request', 'True') + request.add_unredirected_header('Metadata-Flavor', 'Google') return urllib2.urlopen(request).read() except (urllib2.URLError, urllib2.HTTPError, IOError), e: return None diff --git a/google-startup-scripts/usr/share/google/boto/boto_plugins/compute_auth.py b/google-startup-scripts/usr/share/google/boto/boto_plugins/compute_auth.py index 0cefa40..aad5e75 100644 --- a/google-startup-scripts/usr/share/google/boto/boto_plugins/compute_auth.py +++ b/google-startup-scripts/usr/share/google/boto/boto_plugins/compute_auth.py @@ -58,7 +58,7 @@ class ComputeAuth(AuthHandler): def __GetJSONMetadataValue(self, url): try: request = urllib2.Request(url) - request.add_unredirected_header('X-Google-Metadata-Request', 'True') + request.add_unredirected_header('Metadata-Flavor', 'Google') data = urllib2.urlopen(request).read() return json.loads(data) except (urllib2.URLError, urllib2.HTTPError, IOError), e: |