Merge branch 'stable-2.12' into stable-2.13
authorHrvoje Ribicic <riba@google.com>
Mon, 2 Nov 2015 17:49:36 +0000 (17:49 +0000)
committerHrvoje Ribicic <riba@google.com>
Mon, 2 Nov 2015 18:20:34 +0000 (18:20 +0000)
* 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 <riba@google.com>
Reviewed-by: Lisa Velden <velden@google.com>

1  2 
src/Ganeti/Constants.hs
tools/cfgupgrade
tools/post-upgrade

Simple merge
Simple merge
@@@ -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())