summaryrefslogtreecommitdiff
path: root/cloudinit/settings.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-02-13 11:11:26 -0500
committerScott Moser <smoser@ubuntu.com>2014-02-13 11:11:26 -0500
commit516160336dfd5897a12aaa213562d6b8e8c7690d (patch)
treefe25489b30fe648f50b6c3cc1ab2543d2e4c5f55 /cloudinit/settings.py
parentc722a6e9110b8a5dc33de8911cf5734e14dc523f (diff)
parent322e404dcbb891bbdecd1da50e6b4789781a71d5 (diff)
downloadvyos-cloud-init-516160336dfd5897a12aaa213562d6b8e8c7690d.tar.gz
vyos-cloud-init-516160336dfd5897a12aaa213562d6b8e8c7690d.zip
merge from trunk
Diffstat (limited to 'cloudinit/settings.py')
-rw-r--r--cloudinit/settings.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
index 7b0b18e7..0d8d8ec5 100644
--- a/cloudinit/settings.py
+++ b/cloudinit/settings.py
@@ -36,6 +36,7 @@ CFG_BUILTIN = {
'AltCloud',
'OVF',
'MAAS',
+ 'GCE',
'Ec2',
'CloudSigma',
'CloudStack',