chef-provisioning-vsphere 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cffce0a191ef6fba36015eadf1a40fb8687c1ca
-  data.tar.gz: d0d511dc2dd2c5bd6c17931b92841fedbb182e87
+  metadata.gz: a65afc7e0935c6aee4039c0c06e1bed99bd9efce
+  data.tar.gz: ac5179279549c85fd161a44581a89333cb5820d3
 SHA512:
-  metadata.gz: 5fb15e79f694db0a9ad4881e86ace5e406b93bf4ef4017127b04616ce36c2efe80869a57299f32c4a67ebb1b3881b609173d9195be1ee30f39965a279cd36dd8
-  data.tar.gz: 454a31fdee270a2263f73626ebd1d720fd8e69510b4ce981eaf3e6a243813f09cd5aeb5aea57c3d9e97cd3a8f1f5d6768bee283df44bd6961a606d12ca6261dd
+  metadata.gz: 36ce534cda40ec7e9bd8fe06f2403eedc66ce4ac33fe9f053d998fe69b0812e02f968e2c99f8166027c15449037c85482f418d0570d9068760f15201a09a46a2
+  data.tar.gz: 72ae2902ccf4a6adaa4ff74c1df2aadb93904a68864b9caea4c5678c6513d3006da943a9c04813347e74a422530b4fc945fc9e212dfee2896be1a32700399f7f

data/README.md

@@ -84,7 +84,7 @@ This will use chef-zero and needs no chef server (only works for ssh). Note that
 - `[:memory_mb]` - number of megabytes to allocate for machine
 - `[:host]` - `{cluster}`/`{host}` to use during provisioning
 - `[:resource_pool]` - `{cluster}`/`{resource pool}` to use during provisioning
-- `[:additional_disk_size_gb]` - if provided an additional disk will be added with the specified number of gigabytes (*his requires a datastore to be specified*)
+- `[:additional_disk_size_gb]` - an array of numbers, each signifying the number of gigabytes to assign to an additional disk (*his requires a datastore to be specified*)
 - `[:ssh][:user]` user to use for ssh/winrm (defaults to root on linux/administrator on windows)
 - `[:ssh][:password]` - password to use for ssh/winrm
 - `[:ssh][:paranoid]` - specifies the strictness of the host key verification checking
@@ -113,7 +113,7 @@ These are settings set at the root of `machine_options`. Chances are the default
 
 ## More config examples
 
-### Static IP and an additional 50GB disk
+### Static IP and two additional disks of 20 and 50GB
 
 ```
 with_machine_options :bootstrap_options => {
@@ -125,7 +125,7 @@ with_machine_options :bootstrap_options => {
   resource_pool: 'cluster',
   template_name: 'path to template',
   datastore: "my_data_store",
-  additional_disk_size_gb: 50,
+  additional_disk_size_gb: [50,20],
   customization_spec: {
     ipsettings: {
       ip: '192.168.3.4',

data/lib/chef/provisioning/vsphere_driver/driver.rb

@@ -508,11 +508,25 @@ module ChefProvisioningVsphere
 
       vm = vsphere_helper.find_vm(vm_folder, machine_name)
 
-      if bootstrap_options[:additional_disk_size_gb].to_i > 0
+      additional_disk_size_gb = bootstrap_options[:additional_disk_size_gb]
+      if !additional_disk_size_gb.is_a?(Array)
+        additional_disk_size_gb = [additional_disk_size_gb]
+      end        
+
+      additional_disk_size_gb.each do |size|
+        size = size.to_i
+        next if size == 0
+        if bootstrap_options[:datastore].to_s.empty? 
+          raise ':datastore must be specified when adding a disk to a cloned vm'
+        end
         task = vm.ReconfigVM_Task(
           spec: RbVmomi::VIM.VirtualMachineConfigSpec(
             deviceChange: [
-              vsphere_helper.virtual_disk_for(vm, bootstrap_options)
+              vsphere_helper.virtual_disk_for(
+                vm,
+                bootstrap_options[:datastore],
+                size
+              )
             ]
           )
         )

data/lib/chef/provisioning/vsphere_driver/version.rb

@@ -1,3 +1,3 @@
 module ChefProvisioningVsphere
-  VERSION = '0.7.2'
+  VERSION = '0.8.0'
 end

data/lib/chef/provisioning/vsphere_driver/vsphere_helpers.rb

@@ -152,10 +152,7 @@ module ChefProvisioningVsphere
         end
       end
 
-    def virtual_disk_for(vm, options)
-      if options[:datastore].to_s.empty? 
-        raise ':datastore must be specified when adding a disk to a cloned vm'
-      end
+    def virtual_disk_for(vm, datastore, size_gb)
       idx = vm.disks.count
       RbVmomi::VIM::VirtualDeviceConfigSpec(
         :operation     => :add,
@@ -163,11 +160,11 @@ module ChefProvisioningVsphere
         :device        => RbVmomi::VIM.VirtualDisk(
           :key           => idx,
           :backing       => RbVmomi::VIM.VirtualDiskFlatVer2BackingInfo(
-            :fileName        => "[#{options[:datastore]}]",
+            :fileName        => "[#{datastore}]",
             :diskMode        => 'persistent',
             :thinProvisioned => true
           ),
-          :capacityInKB  => options[:additional_disk_size_gb] * 1024 * 1024,
+          :capacityInKB  => size_gb * 1024 * 1024,
           :controllerKey => 1000,
           :unitNumber    => idx
         )

data/spec/integration_tests/vsphere_driver_spec.rb

@@ -107,7 +107,10 @@ describe 'vsphere_driver' do
     end
     it 'has an added disk of the correct size' do
       disk_count = @vm.disks.count
-      expect(@vm.disks[disk_count-1].capacityInKB).to eq(@metal_config[:machine_options][:bootstrap_options][:additional_disk_size_gb] * 1024 * 1024)
+      expect(@vm.disks[disk_count-1].capacityInKB).to eq(@metal_config[:machine_options][:bootstrap_options][:additional_disk_size_gb][1] * 1024 * 1024)
+    end
+    it 'has the correct number of disks' do
+      expect(@vm.disks.count).to eq(3)
     end
     it 'has hot add cpu enabled' do
       expect(@vm.config.cpuHotAddEnabled).to eq(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi