chef-metal-vsphere 0.1.4 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b8ea8bc26ba359b811ea19cfa5876b688437362b
+  data.tar.gz: 3e37abdd15aed60c1b5ff549ee55b06aaaaac116
+SHA512:
+  metadata.gz: 5c67f07c76d42ba8804f369651b7ba88a60d9ac14584cd79ebfc8df25138597606872a9150fb8edd3a6cf055162d4937baf629797f204cd98009885f75d9af47
+  data.tar.gz: cd75aac3d3273599f7499e4603155d6cdea53b4135d047c20fa07f9188b36854eb4ad9b93096f35d5d4b4ee18a3ab9e508f808aa8d7e1235399dbec24c5a4eeb

data/README.md

@@ -26,13 +26,14 @@ Create or obtain a unix/linux VM template.  The VM template must:
       vsphere_password: 'your_mothers_maiden_name'     # consider using a chef-vault
 
     with_provisioner_options('bootstrap_options' => {
-      datacenter:      'datacenter_name',
-      cluster:         'cluster_name',
-      resource_pool:   'resource_pool_name',            # often the same as the cluster_name
-      datastore:       'datastore_name',
-      template_name:   'name_of_template_vm',           # may be a VM or a VM Template
-      template_folder: 'folder_containing_template_vm',
-      vm_folder:       'folder_to_clone_vms_into',
+      datacenter:         'datacenter_name',
+      cluster:            'cluster_name',
+      resource_pool:      'resource_pool_name',            # often the same as the cluster_name
+      datastore:          'datastore_name',
+      template_name:      'name_of_template_vm',           # may be a VM or a VM Template
+      template_folder:    'folder_containing_template_vm',
+      vm_folder:          'folder_to_clone_vms_into',
+      customization_spec: 'standard-config',               # optional
 
       ssh: {                                             # net-ssh start() options
         user:                  'username_on_vm',         # must have nopasswd sudo
@@ -49,6 +50,13 @@ Create or obtain a unix/linux VM template.  The VM template must:
     1.upto 2 do |n|
       machine "metal_#{n}" do
         action [:create]
+
+        ## optionally add options per-machine customizations
+        add_provisioner_options('bootstrap_options' => {
+          num_cpus: n,
+          memory_mb: 1024 * n,
+          annotation: "metal_#{n} created by chef-metal-vsphere"
+        })
       end
 
       machine_file "/tmp/metal_#{n}.txt" do

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

data/lib/chef_metal_vsphere/vsphere_helpers.rb

@@ -4,15 +4,15 @@ module ChefMetalVsphere
     def vim
       # reconnect on every call - connections may silently timeout during long operations (e.g. cloning)
       conn_opts = {
-          :host => connect_options['vsphere_host'],
-          :port => connect_options['vsphere_port'],
-          :path => connect_options['vshere_path'],
-          :use_ssl => connect_options['vsphere_ssl'],
-          :insecure => connect_options['vsphere_insecure'],
-          :proxyHost => connect_options['proxy_host'],
-          :proxyPort => connect_options['proxy_port'],
-          :user => connect_options['vsphere_user'],
-          :password => connect_options['vsphere_password']
+        :host => connect_options['vsphere_host'],
+        :port => connect_options['vsphere_port'],
+        :path => connect_options['vshere_path'],
+        :use_ssl => connect_options['vsphere_ssl'],
+        :insecure => connect_options['vsphere_insecure'],
+        :proxyHost => connect_options['proxy_host'],
+        :proxyPort => connect_options['proxy_port'],
+        :user => connect_options['vsphere_user'],
+        :password => connect_options['vsphere_password']
       }
 
       vim = RbVmomi::VIM.connect conn_opts
@@ -107,13 +107,31 @@ module ChefMetalVsphere
         location: RbVmomi::VIM.VirtualMachineRelocateSpec(pool: pool),
         powerOn: false,
         template: false
-        )
+      )
+
+      clone_spec.config = RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => Array.new)
+
+      unless options['customization_spec'].to_s.empty?
+        clone_spec.customization = find_customization_spec(options['customization_spec'])
+      end
+
+      unless options['annotation'].to_s.nil?
+        clone_spec.config.annotation = options['annotation']
+      end
+
+      unless options['num_cpus'].to_s.nil?
+        clone_spec.config.numCPUs = options['num_cpus']
+      end
+
+      unless options['memory_mb'].to_s.nil?
+        clone_spec.config.memoryMB = options['memory_mb']
+      end
 
       vm_template.CloneVM_Task(
         name: vm_name,
         folder: find_folder(dc_name, options['vm_folder']),
         spec: clone_spec
-        ).wait_for_completion
+      ).wait_for_completion
     end
 
     def find_pool(dc, pool_name)
@@ -138,5 +156,13 @@ module ChefMetalVsphere
       baseEntity = baseEntity.resourcePool if not baseEntity.is_a?(RbVmomi::VIM::ResourcePool) and baseEntity.respond_to?(:resourcePool)
       baseEntity
     end
+
+    def find_customization_spec(customization_spec)
+      csm = vim.serviceContent.customizationSpecManager
+      csi = csm.GetCustomizationSpec(:name => customization_spec)
+      spec = csi.spec
+      raise "Customization Spec not found [#{customization_spec}]" if spec.nil?
+      spec
+    end
   end
 end

data/lib/chef_metal_vsphere/vsphere_provisioner.rb

@@ -215,6 +215,7 @@ module ChefMetalVsphere
       datacenter      = bootstrap_options['datacenter']
       template_folder = bootstrap_options['template_folder']
       template_name   = bootstrap_options['template_name']
+
       vm_template = find_vm(datacenter, template_folder, template_name) or raise("vSphere VM Template not found [#{template_folder}/#{template_name}]")
 
       vm = do_vm_clone(datacenter, vm_template, vm_name, bootstrap_options)
@@ -305,6 +306,5 @@ module ChefMetalVsphere
           end
         ] : h
     end
-
   end
-end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Rally Software Development Corp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,43 +74,36 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- Rakefile
 - LICENSE
 - README.md
+- Rakefile
 - lib/chef_metal/provisioner_init/vsphere_init.rb
+- lib/chef_metal_vsphere.rb
 - lib/chef_metal_vsphere/version.rb
 - lib/chef_metal_vsphere/vsphere_helpers.rb
 - lib/chef_metal_vsphere/vsphere_provisioner.rb
-- lib/chef_metal_vsphere.rb
 homepage: https://github.com/RallySoftware-cookbooks/chef-metal-vsphere
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1936715573261494371
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1936715573261494371
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.28
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provisioner for creating vSphere VM instances in Chef Metal.
 test_files: []