diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-02-13 21:18:17 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-02-13 21:18:17 -0500 |
| commit | 4ba72556193219f90c313f62d0d309761bb53c6b (patch) | |
| tree | 2ad80e184d53a85a1fe5933ad106249bc522da35 /cloudinit/settings.py | |
| parent | 507aeed12312af7fc8a9fcfca6b845183a5a3c51 (diff) | |
| parent | 053667688d7c2ad51e569c62e00dac1942e46f62 (diff) | |
| download | vyos-cloud-init-4ba72556193219f90c313f62d0d309761bb53c6b.tar.gz vyos-cloud-init-4ba72556193219f90c313f62d0d309761bb53c6b.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/settings.py')
| -rw-r--r-- | cloudinit/settings.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cloudinit/settings.py b/cloudinit/settings.py index 7b0b18e7..37d4958b 100644 --- a/cloudinit/settings.py +++ b/cloudinit/settings.py @@ -36,6 +36,8 @@ CFG_BUILTIN = { 'AltCloud', 'OVF', 'MAAS', + 'GCE', + 'OpenStack' 'Ec2', 'CloudSigma', 'CloudStack', |