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 | 14271e89f3a2a6a813fc5aac7163da3defcfd4c1 (patch) | |
| tree | fd1f713ccbe1c8078c1347fad2ce0bd0fac6ec0b /cloudinit | |
| parent | 333130a7ac9df5e698d82dec2cb6e8e44ba1432b (diff) | |
| parent | 8311e8f7a2d4ad782015c0eb4d22efd0c5a8af0f (diff) | |
| download | vyos-cloud-init-14271e89f3a2a6a813fc5aac7163da3defcfd4c1.tar.gz vyos-cloud-init-14271e89f3a2a6a813fc5aac7163da3defcfd4c1.zip | |
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') |