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
commit13abd70c4676aedc7b4f0ac3e9723e36b5b13991 (patch)
treed0e5ea71494038281baa2702464e2b3ff5c401e5
parenta3efb2c405b2b206c70415508153fd93888f0a53 (diff)
parent52982e178a08e25e953d6b65cf64df93169c1ff7 (diff)
downloadcloud-init-13abd70c4676aedc7b4f0ac3e9723e36b5b13991.tar.gz
Remove trailing dot from GCE metadata URL (LP: #1581200) [Phil Roche]
-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')