Permalink
Browse files

Fix cpi_log in vSphere CPI.

Change-Id: Ib4bc637f86e8e902ea797d532f0a9989bc37e9fd
  • Loading branch information...
1 parent 16d1b23 commit ce9e7242ff103adf408cfe1328e18f0ceccdb2bf Vadim Spivak committed Oct 17, 2012
Showing with 4 additions and 3 deletions.
  1. +1 −1 vsphere_cpi/lib/cloud/vsphere/client.rb
  2. +3 −2 vsphere_cpi/lib/cloud/vsphere/config.rb
@@ -13,7 +13,7 @@ class NotLoggedInException < StandardError; end
def initialize(host, options = {})
http_client = HTTPClient.new
- log_path = options["cpi_log"] || options["soap_log"]
+ log_path = options["soap_log"]
if log_path
log_file = File.open(log_path, "w")
log_file.sync = true
@@ -9,7 +9,8 @@ class Config
@schema = Membrane::SchemaParser.parse do
{
"agent" => dict(String, Object), # passthrough to the agent
- "soap_log" => String,
+ optional("cpi_log") => String,
+ optional("soap_log") => String,
optional("mem_overcommit_ratio") => Numeric,
optional("copy_disks") => bool,
"vcenters" => [{
@@ -226,7 +227,7 @@ def configure(config)
@vcenter = VCenterConfig.new(config["vcenters"].first)
@client = Client.new("https://#{@vcenter.host}/sdk/vimService", {
- "soap_log" => config["soap_log"]
+ "soap_log" => config["soap_log"] || config["cpi_log"]
})
@client.login(@vcenter.user, @vcenter.password, "en")

0 comments on commit ce9e724

Please sign in to comment.