summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--config/cloud.cfg2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b0cfb90..56da07c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@
- support empty lines in "#include" files (LP: #923043)
- support configuration of salt minions (Jeff Bauer) (LP: #927795)
- DataSourceOVF: only search for OVF data on ISO9660 filesystems (LP: #898373)
+ - DataSourceConfigDrive: support getting data from openstack config drive (LP: #857378)
0.6.2:
- fix bug where update was not done unless update was explicitly set.
It would not be run if 'upgrade' or packages were set to be installed
diff --git a/config/cloud.cfg b/config/cloud.cfg
index c9b057e0..fe197ca8 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -24,7 +24,7 @@ cloud_config_modules:
- timezone
- puppet
- chef
- - salt
+ - salt-minion
- mcollective
- disable-ec2-metadata
- runcmd