[node-patches] Change in ovirt-node[ovirt-3.5]: Waiting for sshd to generate the keys

[fabiand at redhat.com]

Hello Anatoly Litovsky,

I'd like you to do a code review.  Please visit

    https://gerrit.ovirt.org/48373

to review the following change.

Change subject: Waiting for sshd to generate the keys
......................................................................

Waiting for sshd to generate the keys

In order to persist the fingerprint
we need to wait for sshd service to generate those
We also restart the sshd-keygen service to force key creation

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1248372
Change-Id: I2644fe78b0579ec19732a6ac32fdb89007ff8dcc
Signed-off-by: Tolik Litovsky <tlitovsk at redhat.com>
---
M scripts/ovirt-init-functions.sh.in
M services/ovirt-post.service
2 files changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/73/48373/1

diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in
index 3724454..83deb73 100644
--- a/scripts/ovirt-init-functions.sh.in
+++ b/scripts/ovirt-init-functions.sh.in
@@ -1477,6 +1477,9 @@
         if [[ $(rpm -E "%{?rhel"}) = 6 ]]; then
             /usr/libexec/ovirt-node-hooks trigger on-boot
         fi
+
+        # making sure the sshd-keygen service is up and running
+        service sshd-keygen restart
         ovirt_store_config $(ls /etc/ssh/ssh_host*_key*)
 
         # FIXME is this still needed?
diff --git a/services/ovirt-post.service b/services/ovirt-post.service
index ccc799b..c250f2f 100644
--- a/services/ovirt-post.service
+++ b/services/ovirt-post.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=oVirt Node post configuration service
-After=ovirt.service ovirt-firstboot.service
-Wants=ovirt.service
+After=ovirt.service ovirt-firstboot.service sshd-keygen.service
+Wants=ovirt.service sshd-keygen.service
 Before=getty at tty1.service vdsmd.service supervdsmd.service vdsm-network.service sanlock.service
 
 [Service]


-- 
To view, visit https://gerrit.ovirt.org/48373
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2644fe78b0579ec19732a6ac32fdb89007ff8dcc
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at redhat.com>