knife-vcenter 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ad1c5e3501668037f48c20ccce6dcfa6ad0183c
-  data.tar.gz: cf159caaa9acec16e26677e4caf6b1a2b6e6b0c9
+  metadata.gz: 349985f969ef2f03208406e79737a3fec3f8b3d8
+  data.tar.gz: a805e81d085f8e00c1128e1f117260606b5a9293
 SHA512:
-  metadata.gz: c4ca2d101e8794ae23ee2b05740192c07bfa7ceb68c7b73c67b9cc3a468669182ffdbf9fcaaede9e9871e9c5187a3f6eb3dd4cc1f7d0b2074aad6451f64380f3
-  data.tar.gz: 1539395b4a15987256416e5a6ea0e50ca5903c95cfde21d72e5ded6ec6e9baefa371c9df4b9547710981241a38bb944328b34fbf60a4ed70b8a6c679b09e11f8
+  metadata.gz: e4071809835cf22c85f8a1d5daab0681b6feb2d0f252bd6c9a293a1158f169800d02755a9f48852b424aad049d2ef549a2184fd50e3e373ca0d831972a0ac4e7
+  data.tar.gz: '009aeb4f2f77b51187f2cc856d2a43103407655331b15057fa092ce5c2fb8631ca945ac02e6be0b29e1e8357889041b9d8b83671e572d9f66548bcf9b44ed5af'

data/.gitignore

@@ -17,4 +17,5 @@ mkmf.log
 .ruby-version
 .chef
 local/
-.vscode/
+.vscode/
+.chef/

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 # Change Log
 
-## [1.0.0](https://github.com/chef/knife-vcenter/tree/1.0.0) (2017-08-10)
+## [1.1.0](https://github.com/chef/knife-vcenter/tree/1.1.0) (2017-09-13)
+[Full Changelog](https://github.com/chef/knife-vcenter/compare/v1.0.0...1.1.0)
+
+**Merged pull requests:**
+
+- Updated to make resource\_pool and targethost optional [\#6](https://github.com/chef/knife-vcenter/pull/6) ([russellseymour](https://github.com/russellseymour))
+
+## [v1.0.0](https://github.com/chef/knife-vcenter/tree/v1.0.0) (2017-08-28)
 **Merged pull requests:**
 
+- Added new option to state wether vCenter SDK logs should be displayed [\#4](https://github.com/chef/knife-vcenter/pull/4) ([russellseymour](https://github.com/russellseymour))
 - 1.0.0 release [\#3](https://github.com/chef/knife-vcenter/pull/3) ([jjasghar](https://github.com/jjasghar))
 - Walking through the knife-vcenter code [\#2](https://github.com/chef/knife-vcenter/pull/2) ([jjasghar](https://github.com/jjasghar))
 - Useful information for public release. [\#1](https://github.com/chef/knife-vcenter/pull/1) ([jjasghar](https://github.com/jjasghar))

data/README.md

@@ -50,7 +50,7 @@ knife[:vcenter_disable_ssl_verify] = true # if you want to disable SSL checking
 or alternatively you can supply them on the command-line:
 
 ```bash
-knife vcenter _command_ --vcenter-username myuser --vcanter-password mypassword
+knife vcenter _command_ --vcenter-username myuser --vcenter-password mypassword
 ```
 
 ## Usage
@@ -124,13 +124,16 @@ _The IP address of the machine is not returned yet as this requires a call to a
 
 Create a new machine by cloning an existing machine or a template. This machine will be bootstrapped by Chef, as long as all the relevant details are in the `knife.rb` file.
 
-Parameters that are required are:
+The following parameters are required:
 
- - `--targethost` - The host that the virtual machine should be created on
- - `--folder` - Folder that machine should be stored in. This must already exist.
  - `--datacenter` - Datacenter in the vSphere environment that controls the target host
  - `--template` - Name of the virtual machine or template to use
 
+There are some optional parameters that can be specified:
+
+ - `--targethost` - The host that the virtual machine should be created on. If not specified the first host in the cluster is used.
+ - `--folder` - Folder that machine should be stored in. If specified this must already exist.
+
 ```
 $ knife vcenter vm clone example-01 --targethost 172.16.20.3 --folder example --ssh-password P@ssw0rd! --datacenter Datacenter --template ubuntu16-template -N example-01
 Creating new machine

data/lib/chef/knife/cloud/vcenter_service.rb

@@ -97,10 +97,14 @@ class Chef
           case options[:type]
           when "clone"
 
+            datacenter_exists?(options[:datacenter])
+
             # Some of ht eoptions need to be the ID of the component in VMWAre
             # Update these using the REST API so that they can be passed to the support library
             options[:targethost] = get_host(options[:targethost])
 
+            options[:resource_pool] = get_resource_pool(options[:resource_pool])
+
             # Configure the folder option as a has with the name an the id
             options[:folder] = {
               name: options[:folder],
@@ -159,6 +163,14 @@ class Chef
           Com::Vmware::Vcenter::Cluster.new(vapi_config).list()
         end
 
+        def datacenter_exists?(name)
+          filter = Com::Vmware::Vcenter::Datacenter::FilterSpec.new(names: Set.new([name]))
+          dc_obj = Com::Vmware::Vcenter::Datacenter.new(vapi_config)
+          dc = dc_obj.list(filter)
+  
+          raise format('Unable to find data center: %s', name) if dc.empty?
+        end
+
         def get_folder(name)
           # Create a filter to ensure that only the named folder is returned
           filter = Com::Vmware::Vcenter::Folder::FilterSpec.new({names: Set.new([name])})
@@ -170,23 +182,46 @@ class Chef
         end
 
         def get_host(name)
-          filter = Com::Vmware::Vcenter::Host::FilterSpec.new({names: Set.new([name])})
           host_obj = Com::Vmware::Vcenter::Host.new(vapi_config)
-          host = host_obj.list(filter)
+
+          if name.nil?
+            host = host_obj.list
+          else
+            filter = Com::Vmware::Vcenter::Host::FilterSpec.new({names: Set.new([name])})
+            host = host_obj.list(filter)
+          end
+
           host[0].host
         end
 
         def get_datastore(name)
-          filter = Com::Vmware::Vcenter::Datastore::FilterSpec.new({names: Set.new([name])})
           datastore_obj = Com::Vmware::Vcenter::Datastore.new(vapi_config)
-          datastore = datastore_obj.list(filter)
+
+          if name.nil?
+            datastore = datastore_obj.list
+          else
+            filter = Com::Vmware::Vcenter::Datastore::FilterSpec.new({names: Set.new([name])})
+            datastore = datastore_obj.list(filter)
+          end
+
           datastore[0].datastore
         end
 
-        def get_resourcepool(name)
-          filter = Com::Vmware::Vcenter::ResourcePool::FilterSpec.new({names: Set.new([name])})
-          resource_pool_obj = Com::Vmware::Vcenter::ResourcePool.new(vapi_config)
-          resource_pool = resource_pool_obj.list(filter)
+        def get_resource_pool(name)
+          # Create a resource pool object
+          rp_obj = Com::Vmware::Vcenter::ResourcePool.new(vapi_config)
+
+          # If a name has been set then try to find it, otherwise use the first
+          # resource pool that can be found
+          if name.nil?
+            resource_pool = rp_obj.list
+          else
+            # create a filter to find the named resource pool
+            filter = Com::Vmware::Vcenter::ResourcePool::FilterSpec.new(names: Set.new([name]))
+            resource_pool = rp_obj.list(filter)
+            raise format('Unable to find Resource Pool: %s', name) if resource_pool.nil?
+          end
+
           resource_pool[0].resource_pool
         end
 

data/lib/chef/knife/cloud/vcenter_service_options.rb

@@ -21,7 +21,7 @@ class Chef
   class Knife
     class Cloud
       # rubocop:disable Style/AlignParameters
-      # runodop:disable Metrics/BlockLength
+      # rubocop:disable Metrics/BlockLength
       module VcenterServiceOptions
         def self.included(includer)
           includer.class_eval do

data/lib/chef/knife/vcenter_vm_clone.rb

@@ -32,7 +32,7 @@ class Chef
         include VcenterServiceOptions
         include ServerCreateOptions
 
-        banner 'knife vcenter vm clone NAME'
+        banner 'knife vcenter vm clone NAME (options)'
 
         option :template,
                long:        "--template NAME",
@@ -55,6 +55,14 @@ class Chef
                long:        "--folder NAME",
                description: "Folder to deploy the new machine into"
 
+        option :pool,
+               long:        "--pool NAME",
+               description: "Name of resource pool to use when creating the machine"
+
+        option :node_ssl_verify_mode,
+               :long        => "--node-ssl-verify-mode [peer|none]",
+               :description => "Whether or not to verify the SSL cert for all HTTPS requests."
+
         def validate_params!
           super
 
@@ -62,7 +70,7 @@ class Chef
             ui.error('You must provide the name of the new machine')
           end
 
-          check_for_missing_config_values!(:template, :targethost, :datacenter)
+          check_for_missing_config_values!(:template, :datacenter)
         end
 
         def before_exec_command
@@ -75,9 +83,9 @@ class Chef
             targethost:   locate_config_value(:targethost),
             datacenter:   locate_config_value(:datacenter),
             poweron:      !locate_config_value(:disable_power_on),
-            folder:       locate_config_value(:folder)
+            folder:       locate_config_value(:folder),
+            resource_pool: locate_config_value(:pool),
           }
-
         end
 
         def before_bootstrap

data/lib/knife-vcenter/version.rb

@@ -18,5 +18,5 @@
 #
 
 module KnifeVcenter
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/support/clone_vm.rb

@@ -31,16 +31,18 @@ class Support
     end
 
     def clone
-
       # set the datacenter name
       dc = vim.serviceInstance.find_datacenter(options[:datacenter])
       src_vm = dc.find_vm(options[:template])
-      hosts = dc.hostFolder.children
+
+      raise format("Unable to find template: %s", options[:template]) if src_vm.nil?
 
       # Specify where the machine is going to be created
       relocate_spec = RbVmomi::VIM.VirtualMachineRelocateSpec
       relocate_spec.host = options[:targethost]
-      relocate_spec.pool = hosts.first.resourcePool
+
+      # Set the resource pool
+      relocate_spec.pool = options[:resource_pool]
 
       clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(location: relocate_spec,
                                                         powerOn: options[:poweron],
@@ -49,12 +51,11 @@ class Support
       # Set the folder to use
       dest_folder = options[:folder].nil? ? src_vm.parent : options[:folder][:id]
 
-      puts "Cloning the template to create the new machine..."
+      puts "Cloning the template '#{options[:template]}' to create the VM..."
       task = src_vm.CloneVM_Task(folder: dest_folder, name: options[:name], spec: clone_spec)
       # TODO: it would be nice to have dots to tell you it's working here
       task.wait_for_completion
 
-
       # get the IP address of the machine for bootstrapping
       # machine name is based on the path, e.g. that includes the folder
       name = options[:folder].nil? ? options[:name] : format("%s/%s", options[:folder][:name], options[:name])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vcenter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Chef Partner Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef