clc-chef-metal-vsphere 0.3.45 → 0.3.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a7ee7c19231fcbfec8d122c32ba78dbf116b8f7
-  data.tar.gz: 2ee476a084394418716ffebf43f2375b47f18ffb
+  metadata.gz: afbee2bf3ee8cdd745b6af36604cdc85980d24ee
+  data.tar.gz: 0210fbd720c027bd223bf24439aaa0cfb9cfa7c8
 SHA512:
-  metadata.gz: e8b426d956a1706254792d81e6c6cb8c4435bc72b904e93c851d0fb5e7a584140b6dafda797e8e738dd0ec08567385382793e3e6890c03d995e904fb637bddf6
-  data.tar.gz: af6668c6b9164bc209aad7674c309e9cb8015591abcd2369c633066e155a35433c480f1fc8a7790408a17dbe92c5bb3d852b2a7519effd6fbfe3ce6c7608e594
+  metadata.gz: 61c4a51805b6c274244a1f0c9960a536f1e98f0547b27975e6cfe2832e17dfa452bdb532f8d2e2393bb7eac25025a69427015d1413729a6d69cc67e6784e9431
+  data.tar.gz: 49d78c8937bb8c83547c8d6c7195fec2ae1c1eabbe3f77267553d30b41de811bb566202889dcc399a150ab2e14499d07076513383ef98de657c652ffe6abd5cb

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.45'
+  VERSION = '0.3.46'
 end

data/lib/chef_metal_vsphere/vsphere_helpers.rb

@@ -3,10 +3,24 @@ require 'rbvmomi'
 module ChefMetalVsphere
   module Helpers
 
+    if !$guest_op_managers
+      $guest_op_managers = {}
+    end
+
     def vim(options = connect_options)
       if @current_connection.nil? or @current_connection.serviceContent.sessionManager.currentSession.nil?
         puts "establishing connection to #{options[:host]}"
         @current_connection = RbVmomi::VIM.connect options
+        str_conn = @current_connection.pretty_inspect # a string in the format of VIM(host ip)
+        
+        # we are caching guest operation managers in a global variable...terrible i know
+        # this object is available from the serviceContent object on API version 5 forward
+        # Its a singleton and if another connection is made for the same host and user
+        # that object is not available on any subsequent connection
+        # I could find no documentation that discusses this
+        if !$guest_op_managers.has_key?(str_conn)
+          $guest_op_managers[str_conn] = @current_connection.serviceContent.guestOperationsManager
+        end
       end
 
       @current_connection
@@ -348,6 +362,7 @@ module ChefMetalVsphere
           :joinDomain => cust_options[:domain],
           :domainAdmin => cust_options[:domainAdmin],
           :domainAdminPassword => cust_domain_password)
+        #puts "my env passwd is: #{ENV['domainAdminPassword']}"
         action_handler.report_progress "joining domain #{cust_options[:domain]} with user: #{cust_options[:domainAdmin]}"
       else
         cust_id = RbVmomi::VIM::CustomizationIdentification.new(
@@ -435,7 +450,7 @@ module ChefMetalVsphere
     def upload_file_to_vm(vm, username, password, local, remote)
       auth = RbVmomi::VIM::NamePasswordAuthentication({:username => username, :password => password, :interactiveSession => false})
       size = File.size(local)
-      endpoint = vim.serviceContent.guestOperationsManager.fileManager.InitiateFileTransferToGuest(
+      endpoint = $guest_op_managers[vim.pretty_inspect].fileManager.InitiateFileTransferToGuest(
         :vm => vm, 
         :auth => auth, 
         :guestFilePath => remote,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-chef-metal-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.3.45
+  version: 0.3.46
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef