summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Watkins <daniel.watkins@canonical.com>2016-06-13 10:07:49 +0100
committerDaniel Watkins <daniel.watkins@canonical.com>2016-06-13 10:07:49 +0100
commitd4e9f5d1a9afa5728094cb863dc0a9a0dc09dd04 (patch)
treed0e5ea71494038281baa2702464e2b3ff5c401e5
parentcf7ba5b30597660b7ab4fbdd92f0762e0011c1d6 (diff)
parentdf583f83ac9d4869e0b3df5a904d13890d2f0986 (diff)
downloadvyos-cloud-init-d4e9f5d1a9afa5728094cb863dc0a9a0dc09dd04.tar.gz
vyos-cloud-init-d4e9f5d1a9afa5728094cb863dc0a9a0dc09dd04.zip
Remove trailing dot from GCE metadata URL (LP: #1581200) [Phil Roche]
LP: #1581200
-rw-r--r--ChangeLog1
-rw-r--r--cloudinit/sources/DataSourceGCE.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e2869522..66539792 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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')