[node-patches] Change in ovirt-node[master]: Don't validate SSH key ownership on install/reinstall

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Don't validate SSH key ownership on install/reinstall
......................................................................

Don't validate SSH key ownership on install/reinstall

The SSH keys are regenerated when not booting into an installed
image, and we don't need to check ownership.

It's possible to get into a situation where SSH will not restart
(generating keys), and booting hangs, so we never enter the
installer. Skip it.

Change-Id: I9cdef32853d957987c4467402a077e86e044558b
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1199019
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M hooks/on-boot/03-validate-owner-ssh-keys
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/03/38603/1

diff --git a/hooks/on-boot/03-validate-owner-ssh-keys b/hooks/on-boot/03-validate-owner-ssh-keys
index ce6e7ea..eed7071 100755
--- a/hooks/on-boot/03-validate-owner-ssh-keys
+++ b/hooks/on-boot/03-validate-owner-ssh-keys
@@ -59,4 +59,6 @@
     return 0
 
 if __name__ == "__main__":
-    sys.exit(main())
+    if not any(x in open("/proc/cmdline").read() for x in ["install",
+                                                           "reinstall"]):
+        sys.exit(main())


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cdef32853d957987c4467402a077e86e044558b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>