Commit c89e6fdf authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Merge remote branch 'origin/devel-2.1'



* origin/devel-2.1:
  Improve “gnt-cluster renew-crypto”
  Fix behaviour of gnt-node modify -C no
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parents 084aba47 d512e84b
......@@ -1679,8 +1679,10 @@ class _RunWhileClusterStoppedHelper:
# All daemons are shut down now
try:
return fn(self, *args)
except Exception:
except Exception, err:
_, errmsg = FormatError(err)
logging.exception("Caught exception")
self.feedback_fn(errmsg)
raise
finally:
# Start cluster again, master node last
......
......@@ -3339,7 +3339,7 @@ class LUSetNodeParams(LogicalUnit):
# candidates
(mc_remaining, mc_should, _) = \
self.cfg.GetMasterCandidateStats(exceptions=[node.name])
if mc_remaining != mc_should:
if mc_remaining < mc_should:
raise errors.OpPrereqError("Not enough master candidates, please"
" pass auto_promote to allow promotion",
errors.ECODE_INVAL)
......
......@@ -510,9 +510,6 @@ def _RenewCrypto(new_cluster_cert, new_rapi_cert, rapi_cert_filename,
@param force: Whether to ask user for confirmation
"""
assert (new_cluster_cert or new_rapi_cert or rapi_cert_filename or
new_confd_hmac_key)
if new_rapi_cert and rapi_cert_filename:
ToStderr("Only one of the --new-rapi-certficate and --rapi-certificate"
" options can be specified at the same time.")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment