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

Merge branch 'stable-2.2' into devel-2.2

* stable-2.2:
  Fix breakage introduced by commit 8044bf65


  Remove “dry_run” from opcodes.OpCreateInstance
  Disable the RAPI CA checks in watcher
  move-instance: Fix parameter order in _CreateInstance
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parents 5786c087 bd2475e2
#!/usr/bin/python
#
# Copyright (C) 2006, 2007, 2008 Google Inc.
# Copyright (C) 2006, 2007, 2008, 2009, 2010 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -641,7 +641,7 @@ def IsRapiResponding(hostname):
@return: Whether RAPI is working properly
"""
curl_config = rapi.client.GenericCurlConfig(cafile=constants.RAPI_CERT_FILE)
curl_config = rapi.client.GenericCurlConfig()
rapi_client = rapi.client.GanetiRapiClient(hostname,
curl_config_fn=curl_config)
try:
......
......@@ -6536,7 +6536,6 @@ class LUCreateInstance(LogicalUnit):
("identify_defaults", False, _TBool),
("file_driver", None, _TOr(_TNone, _TElemOf(constants.FILE_DRIVER))),
("file_storage_dir", None, _TMaybeString),
("dry_run", False, _TBool),
]
REQ_BGL = False
......
......@@ -480,7 +480,6 @@ class OpCreateInstance(OpCode):
"source_handshake",
"source_x509_ca",
"source_instance_name",
"dry_run",
]
......
......@@ -437,7 +437,7 @@ class MoveDestExecutor(object):
mrt.dest_to_source.release()
@staticmethod
def _CreateInstance(cl, name, snode, pnode, iallocator, instance, expinfo):
def _CreateInstance(cl, name, pnode, snode, iallocator, instance, expinfo):
"""Starts the instance creation in remote import mode.
@type cl: L{rapi.client.GanetiRapiClient}
......
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