summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--config/cloud.cfg2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 19019c95..9472bd50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
- make metadata urls configurable, to support eucalyptus in
STATIC or SYSTEM modes (LP: #761847)
- support disabling byobu in cloud-config
+ - run cc_ssh as a cloud-init module so it is guaranteed to run before
+ ssh starts (LP: #781101)
0.6.1:
- fix bug in fixing permission on /var/log/cloud-init.log (LP: #704509)
- improve comment strings in rsyslog file tools/21-cloudinit.conf
diff --git a/config/cloud.cfg b/config/cloud.cfg
index 3aaa3eda..b593d90c 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -10,12 +10,12 @@ cloud_init_modules:
- update_hostname
- update_etc_hosts
- rsyslog
+ - ssh
cloud_config_modules:
- mounts
- ssh-import-id
- locale
- - ssh
- set-passwords
- grub-dpkg
- apt-update-upgrade