Merge branch 'hotfix/v0.2.1'

frapposelli · Jul 28, 2014 · efeb268 · efeb268
2 parents d13fcae + 5c60845
commit efeb268
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -1,34 +1,21 @@
 [Vagrant](http://www.vagrantup.com) provider for VMware vCenter®
 =============
 
-[Version 0.2.0](../../releases/tag/v0.2.0) has been released!
+[Version 0.2.1](../../releases/tag/v0.2.1) has been released!
 -------------
 
 Please note that this software is still Alpha/Beta quality and is not recommended for production usage.
 
-Right now a [Precise32](http://vagrant.gosddc.com/boxes/precise32-vcenter.box) is available for use, or you can roll your own as you please, make sure to install VMware tools in it.
+We have a wide array of boxes available at [Vagrant Cloud](https://vagrantcloud.com/gosddc) you can use them directly or you can roll your own as you please, make sure to install VMware tools in it.
 
-Changes in [version 0.2.0](../../releases/tag/v0.2.0) include:
-
-New Features
-
-- Add option to set the actual vm name
-- Set some options in the vm via linux prep
-- Static networking
-- Hostname
-- Add option to set vmnetwork name and backing
-- Vagrant now uses builtin ```SyncedFolders``` helper to synchronize folders
+Changes in [version 0.2.1](../../releases/tag/v0.2.1) include:
 
 Fixes
 
-- Fix the read_ssh_info if the vm doesn't have a network yet at first try the later ssh's wont forever fail
-
-Many thanks to [Karl Pietri](https://github.com/BarnacleBob) for submitting PR [#4](https://github.com/gosddc/vagrant-vcenter/pull/4) with all these new features!
+- Hostname using linux prep needs to be hostname and domain not fqdn on both.
+- Checking the power state at that spot can cause ruby exceptions to be thrown.
 
-Changes in [version 0.1.1](../../releases/tag/v0.1.1) include:
-
-- Support for ```vagrant share``` [Fixes [#2](../../issues/2)]
-- Support for [Vagrant Cloud](http://vagrantcloud.com) boxes [Fixes [#1](../../issues/1)]
+Thanks to [Karl Pietri](https://github.com/BarnacleBob) for this PR.
 
 Install
 -------------
@@ -53,21 +40,11 @@ Configuration
 Here's a sample Multi-VM Vagrantfile:
 
 ```ruby
-precise32_box_url = 'http://vagrant.gosddc.com/boxes/precise32-vcenter.box'
-
 nodes = [
-  { hostname: 'web-vm',
-    box: 'precise32',
-    box_url: precise32_box_url },
-  { hostname: 'ssh-vm',
-    box: 'precise32',
-    box_url: precise32_box_url },
-  { hostname: 'sql-vm',
-    box: 'precise32',
-    box_url: precise32_box_url },
-  { hostname: 'lb-vm',
-    box: 'precise32',
-    box_url: precise32_box_url }
+  { hostname: 'web-vm', box: 'gosddc/precise32' },
+  { hostname: 'ssh-vm', box: 'gosddc/precise32' },
+  { hostname: 'sql-vm', box: 'gosddc/precise32' },
+  { hostname: 'lb-vm', box: 'gosddc/precise32' }
 ]
 
 Vagrant.configure('2') do |config|

diff --git a/lib/vagrant-vcenter/action/build_vm.rb b/lib/vagrant-vcenter/action/build_vm.rb
@@ -112,8 +112,6 @@ def call(env)
                               :portgroupKey => network.key)
                 card.backing = RbVmomi::VIM.VirtualEthernetCardDistributedVirtualPortBackingInfo(
                                :port => switch_port)
-              else
-                abort "vm network type of #{config.vm_network_type} is unknown"
               end 
               dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => card, :operation => "edit")
               config_spec.deviceChange = [dev_spec]
@@ -128,9 +126,9 @@ def call(env)
                           :dnsSuffixList => config.dns_suffix_list)
 
             prep = RbVmomi::VIM.CustomizationLinuxPrep(
-                   :domain => env[:machine].name,
+                   :domain => env[:machine].name.to_s.sub(/^[^.]+\./,''),
                    :hostName => RbVmomi::VIM.CustomizationFixedName(
-                               :name => env[:machine].name))
+                               :name => env[:machine].name.to_s.split('.')[0]))
 
             adapter = RbVmomi::VIM.CustomizationIPSettings(
                       :gateway => [config.gateway],

diff --git a/lib/vagrant-vcenter/action/read_state.rb b/lib/vagrant-vcenter/action/read_state.rb
@@ -27,7 +27,7 @@ def read_state(env)
 
           vm = root_vm_folder.findByUuid(env[:machine].id)
 
-          @logger.debug("Current power state: #{vm.runtime.powerState}")
+          #@logger.debug("Current power state: #{vm.runtime.powerState}")
           vm_name = env[:machine].name
 
           if env[:machine].id.nil?

diff --git a/lib/vagrant-vcenter/version.rb b/lib/vagrant-vcenter/version.rb
@@ -1,6 +1,6 @@
 module VagrantPlugins
   # Set version for vagrant-vcenter gem.
   module VCenter
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end