diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2016-06-15 10:31:44 +0100 |
|---|---|---|
| committer | Daniel Watkins <daniel.watkins@canonical.com> | 2016-06-15 10:31:44 +0100 |
| commit | 946b0f5542ffb43149f60b5dd50b2fb450d23713 (patch) | |
| tree | 686e8c04b6b2491c7adab3433c3190240d2700fa | |
| parent | 632d56a23a947a23e18fa234d675e34a1a119593 (diff) | |
| download | vyos-cloud-init-946b0f5542ffb43149f60b5dd50b2fb450d23713.tar.gz vyos-cloud-init-946b0f5542ffb43149f60b5dd50b2fb450d23713.zip | |
Re-apply "Remove trailing dot from GCE metadata URL (LP: #1581200) [Phil Roche]"
This commit includes the content of that commit, plus a fix for the tests
(provided by Phil).
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | cloudinit/sources/DataSourceGCE.py | 2 | ||||
| -rw-r--r-- | tests/unittests/test_datasource/test_gce.py | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -122,6 +122,7 @@ - ConfigDrive: improved support for networking information from a network_data.json or older interfaces formated network_config. - Change missing Cheetah log warning to debug [Andrew Jorgensen] + - Remove trailing dot from GCE metadata URL (LP: #1581200) [Phil Roche] 0.7.6: - open 0.7.6 diff --git a/cloudinit/sources/DataSourceGCE.py b/cloudinit/sources/DataSourceGCE.py index 9234d1f8..c660a350 100644 --- a/cloudinit/sources/DataSourceGCE.py +++ b/cloudinit/sources/DataSourceGCE.py @@ -25,7 +25,7 @@ from cloudinit import util LOG = logging.getLogger(__name__) BUILTIN_DS_CONFIG = { - 'metadata_url': 'http://metadata.google.internal./computeMetadata/v1/' + 'metadata_url': 'http://metadata.google.internal/computeMetadata/v1/' } REQUIRED_FIELDS = ('instance-id', 'availability-zone', 'local-hostname') diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/test_datasource/test_gce.py index 1f7eb99e..6e62a4d2 100644 --- a/tests/unittests/test_datasource/test_gce.py +++ b/tests/unittests/test_datasource/test_gce.py @@ -52,7 +52,7 @@ GCE_META_ENCODING = { HEADERS = {'X-Google-Metadata-Request': 'True'} MD_URL_RE = re.compile( - r'http://metadata.google.internal./computeMetadata/v1/.*') + r'http://metadata.google.internal/computeMetadata/v1/.*') def _set_mock_metadata(gce_meta=None): |