summaryrefslogtreecommitdiff
path: root/cloudinit/sources/DataSourceGCE.py
diff options
context:
space:
mode:
authorDaniel Watkins <daniel.watkins@canonical.com>2016-06-15 10:31:44 +0100
committerDaniel Watkins <daniel.watkins@canonical.com>2016-06-15 10:31:44 +0100
commit946b0f5542ffb43149f60b5dd50b2fb450d23713 (patch)
tree686e8c04b6b2491c7adab3433c3190240d2700fa /cloudinit/sources/DataSourceGCE.py
parent632d56a23a947a23e18fa234d675e34a1a119593 (diff)
downloadvyos-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).
Diffstat (limited to 'cloudinit/sources/DataSourceGCE.py')
-rw-r--r--cloudinit/sources/DataSourceGCE.py2
1 files changed, 1 insertions, 1 deletions
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')