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

Merge branch 'devel-2.2'



* devel-2.2:
  Allow remote imports without checked names
  ConfigWriter: Fix typo in error message parts
  Fix remote imports
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parents 960d0825 3f2ad566
......@@ -6604,9 +6604,6 @@ class LUCreateInstance(LogicalUnit):
self.op.instance_name = self.hostname1.name
# used in CheckPrereq for ip ping check
self.check_ip = self.hostname1.ip
elif self.op.mode == constants.INSTANCE_REMOTE_IMPORT:
raise errors.OpPrereqError("Remote imports require names to be checked" %
errors.ECODE_INVAL)
else:
self.check_ip = None
......
......@@ -457,7 +457,7 @@ class ConfigWriter:
if [node.master_candidate, node.drained, node.offline].count(True) > 1:
result.append("Node %s state is invalid: master_candidate=%s,"
" drain=%s, offline=%s" %
(node.name, node.master_candidate, node.drain,
(node.name, node.master_candidate, node.drained,
node.offline))
# nodegroups checks
......
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