summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-06-14 15:08:24 -0400
committerScott Moser <smoser@ubuntu.com>2016-06-14 15:08:24 -0400
commit780f88f4dd8ddd36c54e217ea5af3b18b7339758 (patch)
treee753155e3a6f7eaa68b2493902e5a43758ed403b
parentd4e9f5d1a9afa5728094cb863dc0a9a0dc09dd04 (diff)
downloadvyos-cloud-init-780f88f4dd8ddd36c54e217ea5af3b18b7339758.tar.gz
vyos-cloud-init-780f88f4dd8ddd36c54e217ea5af3b18b7339758.zip
[Revert] Remove trailing dot from GCE metadata URL
This change broke tox tests.
-rw-r--r--ChangeLog1
-rw-r--r--cloudinit/sources/DataSourceGCE.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 66539792..e2869522 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -122,7 +122,6 @@
- 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 c660a350..9234d1f8 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')