diff options
author | Scott Moser <smoser@ubuntu.com> | 2014-08-22 16:36:32 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2014-08-22 16:36:32 -0400 |
commit | ba20ec431aa9275423d2e09154f5befb8961373b (patch) | |
tree | a5b7cad4967b208815ac8b0cabfa589e0a0354d4 /cloudinit/settings.py | |
parent | f181c7cbdc08222f195fa84a379f35a456d26123 (diff) | |
parent | d723c17b7abe5263d879d748dade763034cce476 (diff) | |
download | vyos-cloud-init-ba20ec431aa9275423d2e09154f5befb8961373b.tar.gz vyos-cloud-init-ba20ec431aa9275423d2e09154f5befb8961373b.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', |