knife-vsphere 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8385a5227a8b7ca2a3df24c33ad157042949080a
-  data.tar.gz: a1389be7c172d6d83cd2212a3c783f0787e3814b
+  metadata.gz: d1ace6fae44de22b6372e167868b2e3710019f59
+  data.tar.gz: 3073721416e47f816a9da1b73570a8625cb9149b
 SHA512:
-  metadata.gz: 5a109cb170ebcd0708e395efcc4258aca961fd1f32454559533501de58a37401c0165da0964a74a79556ed4fcdd40c2563bc913155047cb4c0233e074484529d
-  data.tar.gz: 9cdb024fe3a930c80eefa15d122c2ab7f696723da86f436544873b0611620b9fd6f41629d78e68454f8983a5635f697e052e334ce897ae635f5d96ef6f70e8cc
+  metadata.gz: 18b0c95d0f67588d8f103c27f3ce83be4f9e5ddebb393fb20609bcd2fe016710d5a15265e2ad3eaab3a3ab62fb7b2686b82eb4072107ccda8febf69168c8b3b9
+  data.tar.gz: cce7f5a115fd16d2d1476a78b03edc932c46acf58a68641bdabbacc2d7d0cfdb0bacf3cd83215ab97f36e19b358729996d1e58957fdfa05e89ba047a620c187a

data/lib/chef/knife/base_vsphere_command.rb

@@ -83,35 +83,37 @@ class Chef
         rval
       end
 
-      def vim_connection
-        conn_opts = {
+      def password
+        if !get_config(:vsphere_pass)
+          # Password is not in the config file - grab it
+          # from the command line
+          get_password_from_stdin
+        elsif get_config(:vsphere_pass).start_with?('base64:')
+          Base64.decode64(get_config(:vsphere_pass)[7..-1]).chomp
+        else
+          get_config(:vsphere_pass)
+        end
+      end
+
+      def conn_opts
+        {
           host: get_config(:vsphere_host),
           path: get_config(:vsphere_path),
           port: get_config(:vsphere_port),
           use_ssl: !get_config(:vsphere_nossl),
           user: get_config(:vsphere_user),
-          password: get_config(:vsphere_pass),
+          password: password,
           insecure: get_config(:vsphere_insecure),
           proxyHost: get_config(:proxy_host),
           proxyPort: get_config(:proxy_port)
         }
+      end
 
-        if !conn_opts[:password]
-          # Password is not in the config file - grab it
-          # from the command line
-          conn_opts[:password] = password
-        elsif conn_opts[:password].start_with?('base64:')
-          conn_opts[:password] = Base64.decode64(conn_opts[:password][7..-1]).chomp
-        end
-
-        #    opt :debug, "Log SOAP messages", :short => 'd', :default => (ENV['RBVMOMI_DEBUG'] || false)
-
-        vim = RbVmomi::VIM.connect conn_opts
-        config[:vim] = vim
-        vim
+      def vim_connection
+        config[:vim] = RbVmomi::VIM.connect conn_opts
       end
 
-      def password
+      def get_password_from_stdin
         @password ||= ui.ask('Enter your password: ') { |q| q.echo = false }
       end
 

data/lib/chef/knife/vsphere_vm_state.rb

@@ -27,7 +27,7 @@ class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
   option :state,
          short: '-s STATE',
          long: '--state STATE',
-         description: 'The power state to transition the VM into; one of on|off|suspended'
+         description: 'The power state to transition the VM into; one of on|off|suspended|reboot'
 
   option :wait_port,
          short: '-w PORT',
@@ -110,6 +110,9 @@ class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
       when 'reset'
         vm.ResetVM_Task.wait_for_completion
         puts "Reset virtual machine #{vmname}"
+      when 'reboot'
+        vm.RebootGuest
+        puts "Reboot virtual machine #{vmname}"
       end
 
       if get_config(:wait_port)

data/lib/chef/knife/vsphere_vm_vmdk_add.rb

@@ -60,7 +60,15 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
       # create the vm folder on the LUN or subsequent operations will fail.
       unless vmdk_datastore.exists? vmname
         dc = datacenter
-        dc._connection.serviceContent.fileManager.MakeDirectory name: vmdk_dir, datacenter: dc, createParentDirectories: false
+        begin
+          dc._connection.serviceContent.fileManager.MakeDirectory name: vmdk_dir, datacenter: dc, createParentDirectories: false
+        rescue RbVmomi::Fault => e
+          ui.warn "Ignoring a fault when trying to create #{vmdk_dir}. This may be related to issue #213."
+          if log_verbose?
+            puts "Chose #{vmdk_datastore.name} out of #{vmdk_datastores.map(&:name).join(', ')}"
+            puts e
+          end
+        end
       end
     end
 

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.6'
+  VERSION = '1.2.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: VMware vSphere Support for Chef's Knife Command
 email: ezra@cpan.org
 executables: []
@@ -147,8 +175,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: vSphere Support for Knife
 test_files: []
+has_rdoc: