diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-08-21 13:56:17 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-08-21 13:56:17 -0400 |
| commit | bf89def9439c5721ee700bfb622d86693cdbf491 (patch) | |
| tree | 8b2de6dcb3266e462a959ec319c55b35121b6f72 | |
| parent | a59eba66ede19aa85f53a1d2b67c3ffd8860b449 (diff) | |
| parent | 31621d585d183e09b3d857ef2a16bfb699b3a591 (diff) | |
| download | vyos-cloud-init-bf89def9439c5721ee700bfb622d86693cdbf491.tar.gz vyos-cloud-init-bf89def9439c5721ee700bfb622d86693cdbf491.zip | |
systemd: make cloud-init block ssh service startup to guarantee keys exist
LP: #1333920
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | systemd/cloud-init.service | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -17,6 +17,8 @@ - do not write comments in /etc/timezone (LP: #1341710) - ubuntu: provide 'ubuntu-init-switch' module to aid in systemd testing. - 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) 0.7.5: - open 0.7.5 - Add a debug log message around import failures diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service index 018a1fa8..6b0c7229 100644 --- a/systemd/cloud-init.service +++ b/systemd/cloud-init.service @@ -1,8 +1,9 @@ [Unit] Description=Initial cloud-init job (metadata service crawler) After=local-fs.target network.target cloud-init-local.service +Before=sshd.service sshd-keygen.service Requires=network.target -Wants=local-fs.target cloud-init-local.service +Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.service [Service] Type=oneshot |