diff options
author | Scott Moser <smoser@ubuntu.com> | 2014-09-22 14:00:39 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2014-09-22 14:00:39 -0400 |
commit | b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488 (patch) | |
tree | 186d80c155d32f75d8efa3c6ec1ad3562f11ba0a /cloudinit/settings.py | |
parent | 26e6c265277cf5e29b8af311f2bb8759b0e811cd (diff) | |
parent | b76866ad72d433cc9008a137c464c7ed44401549 (diff) | |
download | vyos-cloud-init-b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488.tar.gz vyos-cloud-init-b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488.zip |
merge from trunk
Diffstat (limited to 'cloudinit/settings.py')
-rw-r--r-- | cloudinit/settings.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/settings.py b/cloudinit/settings.py index 37d4958b..5efcb0b0 100644 --- a/cloudinit/settings.py +++ b/cloudinit/settings.py @@ -37,7 +37,7 @@ CFG_BUILTIN = { 'OVF', 'MAAS', 'GCE', - 'OpenStack' + 'OpenStack', 'Ec2', 'CloudSigma', 'CloudStack', |