summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-08-21 14:04:25 -0400
committerScott Moser <smoser@ubuntu.com>2014-08-21 14:04:25 -0400
commitd8c8a87f9b4c314bc39f5987602c02d3861f329f (patch)
treed1b15991f9f18176f0a960f34a7e7d7077e782c8
parentbf89def9439c5721ee700bfb622d86693cdbf491 (diff)
downloadvyos-cloud-init-d8c8a87f9b4c314bc39f5987602c02d3861f329f.tar.gz
vyos-cloud-init-d8c8a87f9b4c314bc39f5987602c02d3861f329f.zip
settings: fix typo resulting in OpenStack and GCE not running.
LP: #1329583
-rw-r--r--ChangeLog2
-rw-r--r--cloudinit/settings.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c52d83b7..4d8d6427 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@
- status/result json: remove 'end' entry which was always null
- systemd: make cloud-init block ssh service startup to guarantee keys
are generated. [Jordan Evans] (LP: #1333920)
+ - default settings: fix typo resulting in OpenStack and GCE not working
+ unless config explicitly provided (LP: #1329583) [Garrett Holmstrom])
0.7.5:
- open 0.7.5
- Add a debug log message around import failures
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',