vagrant-vsphere 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e49d547203d8ee98f795bfe1be9e273bc7c61c2d
-  data.tar.gz: 3e289e73eac5c025b66b6f048381aa46cc8ec019
+  metadata.gz: c01f25efa00ea98bcb452252a6b12b97b1b0995f
+  data.tar.gz: 884af0b718650b7e200da266d733d14da07481dd
 SHA512:
-  metadata.gz: 3d89a596244ca10223e04c6e9dd3f9625a74900610c8edebddcf4395ea20d294f9dbb780681740434e9232483cc55adce974dad2a2a35a0e06d607a6a78796d2
-  data.tar.gz: 140c1fa914ad99c287070cdbf5cc79c6912956a31b9dc1c099eb96ccb244f6ffe6346627a53e781b8554b6f5d263a30ffedb2c056d104eacbdebb9c894570291
+  metadata.gz: 323c6212de083fabb6201868fa1a5aaa244a8cc3cd8b9ee4eb80ff6350e4ee857019b44a0a7b82c59e5932d9572b2d4fd24e4426c43d71be17673edeb86d72b9
+  data.tar.gz: f4c4eb69428cc68ea185704f2c4d8684541457061f8328ccc675f8ddeb424d115e733c01337eef87d5a86833ab51bd0d0d334e10731d644a0204df144ab01478

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.0
+current_version = 1.3.0
 tag = true
 commit = true
 

data/.rubocop_todo.yml

@@ -1,5 +1,5 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-07-09 10:56:49 -0600 using RuboCop version 0.32.1.
+# on 2015-07-15 14:24:31 -0600 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
@@ -11,18 +11,18 @@ Lint/NonLocalExitFromIterator:
 
 # Offense count: 11
 Metrics/AbcSize:
-  Max: 105
+  Max: 113
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 149
+  Max: 157
 
 # Offense count: 3
 Metrics/CyclomaticComplexity:
-  Max: 15
+  Max: 17
 
-# Offense count: 99
+# Offense count: 103
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 177
@@ -30,18 +30,18 @@ Metrics/LineLength:
 # Offense count: 12
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 54
+  Max: 56
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 157
+  Max: 161
 
 # Offense count: 3
 Metrics/PerceivedComplexity:
-  Max: 16
+  Max: 18
 
-# Offense count: 24
+# Offense count: 25
 Style/Documentation:
   Enabled: false
 

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
+cache: bundler
 rvm:
   - 2.0.0
+
 before_install:
   - rvm @global do gem uninstall bundler --all --executables
   - gem uninstall bundler --all --executables
-  - gem install bundler --version '< 1.7.0'
+  - gem install bundler --version '1.6.9'
+
+sudo: false

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [1.3.0 (2015-07-21)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.3.0)
+
+  - Add ability to configure CPU and memory reservations
+    ([edmcman:resource_limit](https://github.com/nsidc/vagrant-vsphere/pull/137))
+  - Bypass "graceful" shut down attempts with `vagrant destroy --force`
+
 ## [1.2.0 (2015-07-09)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.2.0)
 
   - Add `public_address` provider capability

data/README.md

@@ -19,9 +19,9 @@ This provider is built on top of the
 * libxml2, libxml2-dev, libxslt, libxslt-dev
 
 ## Current Version
-**version: 1.2.0**
+**version: 1.3.0**
 
-vagrant-vsphere (**version: 1.2.0**) is available from
+vagrant-vsphere (**version: 1.3.0**) is available from
 [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation
@@ -131,6 +131,8 @@ This provider has the following settings, all are required unless noted:
 * `memory_mb` - _Optional_ Configure the amount of memory (in MB) for the new VM
 * `cpu_count` - _Optional_ Configure the number of CPUs for the new VM
 * `mac` - _Optional_ Used to set the mac address of the new VM
+* `cpu_reservation` - _Optional_ Configure the CPU time (in MHz) to reserve for this VM
+* `mem_reservation` - _Optional_ Configure the memory (in MB) to reserve for this VM
 
 ### Cloning from a VM rather than a template
 

data/lib/vSphere/action.rb

@@ -14,6 +14,11 @@ module VagrantPlugins
 
           b.use Call, IsRunning do |env, b2|
             if env[:result]
+              if env[:force_confirm_destroy]
+                b2.use PowerOff
+                next
+              end
+
               b2.use Call, GracefulHalt, :poweroff, :running do |env2, b3|
                 b3.use PowerOff unless env2[:result]
               end

data/lib/vSphere/action/clone.rb

@@ -40,6 +40,8 @@ module VagrantPlugins
             add_custom_vlan(template, dc, spec, config.vlan) unless config.vlan.nil?
             add_custom_memory(spec, config.memory_mb) unless config.memory_mb.nil?
             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?
 
             if !config.clone_from_vm && ds.is_a?(RbVmomi::VIM::StoragePod)
 
@@ -214,6 +216,14 @@ module VagrantPlugins
         def add_custom_cpu(spec, cpu_count)
           spec[:config][:numCPUs] = Integer(cpu_count)
         end
+
+        def add_custom_cpu_reservation(spec, cpu_reservation)
+          spec[:config][:cpuAllocation] = RbVmomi::VIM.ResourceAllocationInfo(reservation: cpu_reservation)
+        end
+
+        def add_custom_mem_reservation(spec, mem_reservation)
+          spec[:config][:memoryAllocation] = RbVmomi::VIM.ResourceAllocationInfo(reservation: mem_reservation)
+        end
       end
     end
   end

data/lib/vSphere/config.rb

@@ -23,6 +23,8 @@ module VagrantPlugins
       attr_accessor :mac
       attr_accessor :memory_mb
       attr_accessor :cpu_count
+      attr_accessor :cpu_reservation
+      attr_accessor :mem_reservation
 
       def validate(machine)
         errors = _detected_errors

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end

data/spec/spec_helper.rb

@@ -55,7 +55,9 @@ RSpec.configure do |config|
         vlan: nil,
         memory_mb: nil,
         cpu_count: nil,
-        mac: nil)
+        mac: nil,
+        cpu_reservation: nil,
+        mem_reservation: nil)
     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.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew Grauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri