bug 13012: not sure why id_rsa has passphrase, use the new script to create ssh key, make sure there is no passphrase in the key.

anthonyxu · anthonyxu · commit 4bd58bf75101 · 2012-01-11T18:36:03.000-08:00
status 13012: resolved fixed
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -571,7 +571,7 @@ protected void updateKeyPairs() {
                 s_logger.info("Systemvm keypairs not found in database. Need to store them in the database");
             }
             //FIXME: take a global database lock here for safety. 
-            Script.runSimpleBashScript("if [ -f ~/.ssh/id_rsa ] ; then true ; else yes '' | ssh-keygen -t rsa -q ; fi");
+            Script.runSimpleBashScript("if [ -f ~/.ssh/id_rsa ] ; then rm -f ~/.ssh/id_rsa ; fi; ssh-keygen -t rsa -N '' -f ~/.ssh/id_rsa -q");
 
             byte[] arr1 = new byte[4094]; // configuration table column value size
             try {

Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,7 @@ protected void updateKeyPairs() {`
`571`	`571`	`s_logger.info("Systemvm keypairs not found in database. Need to store them in the database");`
`572`	`572`	`}`
`573`	`573`	`//FIXME: take a global database lock here for safety.`
`574`		`- Script.runSimpleBashScript("if [ -f ~/.ssh/id_rsa ] ; then true ; else yes '' \| ssh-keygen -t rsa -q ; fi");`
	`574`	`+ Script.runSimpleBashScript("if [ -f ~/.ssh/id_rsa ] ; then rm -f ~/.ssh/id_rsa ; fi; ssh-keygen -t rsa -N '' -f ~/.ssh/id_rsa -q");`
`575`	`575`
`576`	`576`	`byte[] arr1 = new byte[4094]; // configuration table column value size`
`577`	`577`	`try {`