commit 89f00fd32a579c8b893470123f90d8b60b123b46
Merge: aef0cf5 ef3b5b4
Author: Hrvoje Ribicic <[email protected]>
Date: Mon Nov 2 17:49:36 2015 +0000
Merge branch 'stable-2.12' into stable-2.13
* stable-2.12
Return the correct error code in the post-upgrade script
Make openssl refrain from DH altogether
Fix upgrades of instances with missing creation time
Conflicts:
cfgupgrade_unittest.py: merge version tests
tools/post-upgrade: return the correct error code for SSH
renewal as well
Signed-off-by: Hrvoje Ribicic <[email protected]>
diff --cc tools/post-upgrade
index 08ade62,d625360..530124b
--- a/tools/post-upgrade
+++ b/tools/post-upgrade
@@@ -57,15 -59,9 +59,17 @@@ def main()
if result.failed:
cli.ToStderr("Failed to create node certificates: %s; Output %s" %
(result.fail_reason, result.output))
+ error_code = 1
+ if utils.version.IsBefore(version, 2, 13, 0):
+ result = utils.RunCmd(["gnt-cluster", "renew-crypto",
+ "--new-ssh-keys", "--no-ssh-key-check", "-f"])
+ if result.failed:
+ cli.ToStderr("Failed to create SSH keys: %s; Output %s" %
+ (result.fail_reason, result.output))
++ error_code = 1
+
- return 0
+ return error_code
if __name__ == "__main__":
exit(main())
Hrvoje Ribicic
Ganeti Engineering
Google Germany GmbH
Dienerstr. 12, 80331, München
Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind,
leiten Sie diese bitte nicht weiter, informieren Sie den Absender und
löschen Sie die E-Mail und alle Anhänge. Vielen Dank.
This e-mail is confidential. If you are not the right addressee please do
not forward it, please inform the sender, and please erase this e-mail
including any attachments. Thanks.
