summaryrefslogtreecommitdiff
path: root/cloudinit/settings.py
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2017-07-31 14:46:00 -0400
committerScott Moser <smoser@brickies.net>2017-07-31 14:46:00 -0400
commit19c248d009af6a7cff26fbb2febf5c958987084d (patch)
tree521cc4c8cd303fd7a9eb56bc4eb5975c48996298 /cloudinit/settings.py
parentf47c7ac027fc905ca7f6bee776007e2a922c117e (diff)
parente586fe35a692b7519000005c8024ebd2bcbc82e0 (diff)
downloadvyos-cloud-init-19c248d009af6a7cff26fbb2febf5c958987084d.tar.gz
vyos-cloud-init-19c248d009af6a7cff26fbb2febf5c958987084d.zip
merge from master at 0.7.9-233-ge586fe35
Diffstat (limited to 'cloudinit/settings.py')
-rw-r--r--cloudinit/settings.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
index 411960d8..c120498f 100644
--- a/cloudinit/settings.py
+++ b/cloudinit/settings.py
@@ -29,11 +29,13 @@ CFG_BUILTIN = {
'MAAS',
'GCE',
'OpenStack',
+ 'AliYun',
'Ec2',
'CloudSigma',
'CloudStack',
'SmartOS',
'Bigstep',
+ 'Scaleway',
# At the end to act as a 'catch' when none of the above work...
'None',
],