diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-06-15 21:12:29 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-06-15 21:12:29 -0400 |
| commit | 5783b85f6ba81824d3303fc0ecd38b7cffddb54c (patch) | |
| tree | fd1f713ccbe1c8078c1347fad2ce0bd0fac6ec0b /cloudinit | |
| parent | 7a330815c8d7cdaf765113ed9bf58aa0f9e83df9 (diff) | |
| parent | 10facc1861571b5bf38d568457f5e2dec51dd4ce (diff) | |
| download | cloud-init-5783b85f6ba81824d3303fc0ecd38b7cffddb54c.tar.gz | |
merge with trunk
Diffstat (limited to 'cloudinit')
| -rw-r--r--[-rwxr-xr-x] | cloudinit/cmd/main.py | 0 | ||||
| -rw-r--r-- | cloudinit/sources/DataSourceGCE.py | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/cmd/main.py b/cloudinit/cmd/main.py index 63621c1d..63621c1d 100755..100644 --- a/cloudinit/cmd/main.py +++ b/cloudinit/cmd/main.py 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') |