vagrant-vsphere 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7747b951188bee2b8908f9273b0b50600a84bc7c
-  data.tar.gz: 2cc6660d48609b56c3e0b413b88f0d9c97c763c4
+  metadata.gz: 2e9dc00d36f4b543b993242631e336c96bfd6c81
+  data.tar.gz: cba9bf33b1f3928966fa7ddd55218e74640ed1ef
 SHA512:
-  metadata.gz: 9f9b21cd04aad4d2af7885f0a4c447016b413b5649706074b9bb3e4d2fc6e9f7ef597d805f848dc4d1d5c1c8fb6fe965e0dc26dbdfbd35d7d3a3c618772217f2
-  data.tar.gz: b22d5a1351afd85c1f6cdb53da5152a5d0d4a70df5c3ccaf5acfb0941d6ab4cd8c8bf27b6158cecea7ee436eab8ea64c4734ecb26b1f6f8559c2624f97b8dee9
+  metadata.gz: f8f86e54afe1fc8eb3fb4532ea4c7fbe8da30bc3d2276a84680005bb33333aa70bcd272546559b87e784ca427b897ed96667541be39aacf302a08b000fa518b8
+  data.tar.gz: dd0a26aa3c040cd6ef21ac1826e8b21109ea55a71dacf6100d1f35954898159a1927a5a5252e3d1858717aa91335c2383d8eddae5be9ab262c0e49705e255be4

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.6.0
+current_version = 1.7.0
 tag = true
 commit = true
 
@@ -8,4 +8,3 @@ commit = true
 [bumpversion:file:README.md]
 parse = version: (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
 serialize = version: {major}.{minor}.{patch}
-

data/.rubocop.yml

@@ -11,3 +11,24 @@ Lint/RescueException:
     # lib/vSphere/util/vim_helpers.rb to continue rescuing Exception in that
     # method
     - 'lib/vSphere/util/vim_helpers.rb'
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,5 +1,5 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-09-02 10:38:06 -0600 using RuboCop version 0.32.1.
+# on 2016-03-08 12:12:34 -0700 using RuboCop version 0.32.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -9,40 +9,14 @@
 Lint/NonLocalExitFromIterator:
   Enabled: false
 
-# Offense count: 11
-Metrics/AbcSize:
-  Max: 120
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 169
-
-# Offense count: 3
-Metrics/CyclomaticComplexity:
-  Max: 18
-
-# Offense count: 108
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
-  Max: 177
-
-# Offense count: 12
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 60
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 162
+# Offense count: 24
+Style/Documentation:
+  Enabled: false
 
 # Offense count: 3
-Metrics/PerceivedComplexity:
-  Max: 19
-
-# Offense count: 25
-Style/Documentation:
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundBlockBody:
   Enabled: false
 
 # Offense count: 1
@@ -56,7 +30,7 @@ Style/EmptyLiteral:
 Style/FirstParameterIndentation:
   Enabled: false
 
-# Offense count: 5
+# Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
 Style/HashSyntax:
@@ -74,6 +48,12 @@ Style/RegexpLiteral:
 Style/SpaceAroundOperators:
   Enabled: false
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/StringLiterals:
+  Enabled: false
+
 # Offense count: 4
 # Cop supports --auto-correct.
 Style/SymbolLiteral:

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [1.7.0 (2016-03-14)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.7.0)
+
+  - Add support for setting guestinfo variables
+    ([Sharpie:add-guestinfo-support](https://github.com/nsidc/vagrant-vsphere/pull/174)).
+  - Run provisioner cleanup when destroying VMs
+    ([Sharpie:enable-provisioner-cleanup](https://github.com/nsidc/vagrant-vsphere/pull/176)).
+  - Add the ability to configure the notes on the newly cloned VM
+    ([rylarson:feature/rylarson-add-notes](https://github.com/nsidc/vagrant-vsphere/pull/178)).
+
 ## [1.6.0 (2016-01-21)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.6.0)
 
   - Use Vagrant core API instead of waiting for SSH communicator, which should

data/README.md

@@ -6,7 +6,7 @@ This is a [Vagrant](http://www.vagrantup.com) 1.6.4+ plugin that adds a
 [vSphere](http://pubs.vmware.com/vsphere-50/index.jsp?topic=%2Fcom.vmware.wssdk.apiref.doc_50%2Fright-pane.html)
 provider to Vagrant, allowing Vagrant to control and provision machines using
 VMware. New machines are created from virtual machines or templates which must
-be configured prior to using using this provider.
+be configured prior to using this provider.
 
 This provider is built on top of the
 [RbVmomi](https://github.com/vmware/rbvmomi) Ruby interface to the vSphere API.
@@ -19,9 +19,9 @@ This provider is built on top of the
 * libxml2, libxml2-dev, libxslt, libxslt-dev
 
 ## Current Version
-**version: 1.6.0**
+**version: 1.7.0**
 
-vagrant-vsphere (**version: 1.6.0**) is available from
+vagrant-vsphere (**version: 1.7.0**) is available from
 [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation
@@ -110,7 +110,7 @@ This provider has the following settings, all are required unless noted:
   the template and where the new VM will be created, if not specified the first
   datacenter found will be used
 * `compute_resource_name` - _Required if cloning from template_ the name of the
-  host containing the resource pool for the new VM
+  host or cluster containing the resource pool for the new VM
 * `resource_pool_name` - the resource pool for the new VM. If not supplied, and
   cloning from a template, uses the root resource pool
 * `clone_from_vm` - _Optional_ use a virtual machine instead of a template as
@@ -140,6 +140,11 @@ This provider has the following settings, all are required unless noted:
   to the VM upon creation. This method takes a key/value pair,
   e.g. `vsphere.custom_attribute('timestamp', Time.now.to_s)`, and may be called
   multiple times to set different attributes.
+* `extra_config` - _Optional_ A hash of extra configuration values to add to
+  the VM during creation. These are of the form `{'guestinfo.some.variable' => 'somevalue'}`,
+  where the key must start with `guestinfo.`. VMs with VWware Tools installed can
+  retrieve the value of these variables using the `vmtoolsd` command: `vmtoolsd --cmd 'info-get guestinfo.some.variable'`.
+* `notes` - _Optional_ Add arbitrary notes to the VM
 
 ### Cloning from a VM rather than a template
 
@@ -201,7 +206,7 @@ executions.
 This is useful if running Vagrant from multiple directories or if multiple
 machines are defined in the Vagrantfile.
 
-### Setting addresType for network adapter
+### Setting addressType for network adapter
 
 This sets the addressType of the network adapter, for example 'Manual' to
 be able to set a manual mac address.

data/lib/vSphere/action/clone.rb

@@ -41,6 +41,8 @@ module VagrantPlugins
             add_custom_cpu(spec, config.cpu_count) unless config.cpu_count.nil?
             add_custom_cpu_reservation(spec, config.cpu_reservation) unless config.cpu_reservation.nil?
             add_custom_mem_reservation(spec, config.mem_reservation) unless config.mem_reservation.nil?
+            add_custom_extra_config(spec, config.extra_config) unless config.extra_config.empty?
+            add_custom_notes(spec, config.notes) unless config.notes.nil?
 
             if !config.clone_from_vm && ds.is_a?(RbVmomi::VIM::StoragePod)
 
@@ -233,6 +235,18 @@ module VagrantPlugins
         def add_custom_mem_reservation(spec, mem_reservation)
           spec[:config][:memoryAllocation] = RbVmomi::VIM.ResourceAllocationInfo(reservation: mem_reservation)
         end
+
+        def add_custom_extra_config(spec, extra_config = {})
+          return if extra_config.empty?
+
+          # extraConfig must be an array of hashes with `key` and `value`
+          # entries.
+          spec[:config][:extraConfig] = extra_config.map { |k, v| { 'key' => k, 'value' => v } }
+        end
+
+        def add_custom_notes(spec, notes)
+          spec[:config][:annotation] = notes
+        end
       end
     end
   end

data/lib/vSphere/action.rb

@@ -11,6 +11,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use ConnectVSphere
+          b.use(ProvisionerCleanup, :before)
 
           b.use Call, IsRunning do |env, b2|
             if env[:result]

data/lib/vSphere/config.rb

@@ -26,11 +26,14 @@ module VagrantPlugins
       attr_accessor :cpu_count
       attr_accessor :cpu_reservation
       attr_accessor :mem_reservation
+      attr_accessor :extra_config
+      attr_accessor :notes
 
       attr_reader :custom_attributes
 
       def initialize
         @custom_attributes = {}
+        @extra_config = {}
       end
 
       def custom_attribute(key, value)

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '1.6.0'
+    VERSION = '1.7.0'
   end
 end

data/spec/action_spec.rb

@@ -8,6 +8,9 @@ describe VagrantPlugins::VSphere::Action do
 
   before :each do
     @machine.stub(:id).and_return(EXISTING_UUID)
+    # Vagrant has some pretty buggy multi threading and their conditions
+    # check can fail if the wait_for_ready method returns right away
+    @machine.communicate.stub(:wait_for_ready) { sleep(1) }
   end
 
   describe 'up' do

data/spec/clone_spec.rb

@@ -99,4 +99,31 @@ describe VagrantPlugins::VSphere::Action::Clone do
               config: RbVmomi::VIM.VirtualMachineConfigSpec }
     )
   end
+
+  it 'should set extraConfig if specified' do
+    @machine.provider_config.stub(:extra_config).and_return(
+      'guestinfo.hostname' => 'somehost.testvm')
+    expected_config = RbVmomi::VIM.VirtualMachineConfigSpec(extraConfig: [
+      { 'key' => 'guestinfo.hostname', 'value' => 'somehost.testvm' }
+    ])
+
+    call
+    expect(@template).to have_received(:CloneVM_Task).with(
+      folder: @data_center,
+      name: NAME,
+      spec: { location: { pool: @child_resource_pool },
+              config: expected_config }
+    )
+  end
+
+  it 'should set custom notes when they are specified' do
+    @machine.provider_config.stub(:notes).and_return('custom_notes')
+    call
+    expect(@template).to have_received(:CloneVM_Task).with(
+      folder: @data_center,
+      name: NAME,
+      spec: { location: { pool: @child_resource_pool },
+              config: RbVmomi::VIM.VirtualMachineConfigSpec(annotation: 'custom_notes') }
+    )
+  end
 end

data/spec/spec_helper.rb

@@ -59,7 +59,9 @@ RSpec.configure do |config|
         addressType: nil,
         cpu_reservation: nil,
         mem_reservation: nil,
-        custom_attributes: {})
+        custom_attributes: {},
+        notes: nil,
+        extra_config: {})
     vm_config = double(
       vm: double('config_vm',
                  box: nil,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Andrew Grauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri