vagrant 0.9.4 → 0.9.5

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.9.5 (February 5, 2012)
+
+  - Fix crashing case when all network options are `:auto_config false`.
+    [GH-689]
+  - Type of network adapter can be specified with `:nic_type`. [GH-690]
+  - The NFS version can be specified with the `:nfs_version` option
+    on shared folders. [GH-557]
+  - Greatly improved FreeBSD guest and host support. [GH-695]
+  - Fix instability with RedHat guests and host only and bridged networks.
+    [GH-698]
+  - When using bridged networking, only list the network interfaces
+    that are up as choices. [GH-701]
+  - More intelligent handling of the `certname` option for puppet
+    server. [GH-702]
+  - You may now explicitly set the network to bridge to in the Vagrantfile
+    using the `:bridge` parameter. [GH-655]
+
 ## 0.9.4 (January 28, 2012)
 
   - Important internal changes to middlewares that make plugin developer's

data/lib/vagrant/action/vm/network.rb

@@ -64,7 +64,7 @@ module Vagrant
           # setup until after it is booted.
           @app.call(env)
 
-          if !adapters.empty?
+          if !adapters.empty? && !networks.empty?
             # Determine the interface numbers for the guest.
             assign_interface_numbers(networks, adapters)
 
@@ -313,38 +313,70 @@ module Vagrant
           return {
             :adapter => nil,
             :mac     => nil,
+            :bridge  => nil,
             :auto_config => true
           }.merge(options)
         end
 
         def bridged_adapter(config)
+          # Find the bridged interfaces that are available
           bridgedifs = @env[:vm].driver.read_bridged_interfaces
+          bridgedifs.delete_if { |interface| interface[:status] == "Down" }
 
+          # The name of the chosen bridge interface will be assigned to this
+          # variable.
           chosen_bridge = nil
-          if bridgedifs.length == 1
-            # One bridgable interface? Just use it.
-            chosen_bridge = bridgedifs[0][:name]
-          else
-            # More than one bridgable interface requires a user decision, so
-            # show options to choose from.
-            @env[:ui].info I18n.t("vagrant.actions.vm.bridged_networking.available",
-                                  :prefix => false)
-            bridgedifs.each_index do |index|
-              interface = bridgedifs[index]
-              @env[:ui].info("#{index + 1}) #{interface[:name]}", :prefix => false)
-            end
 
-            # The range of valid choices
-            valid = Range.new(1, bridgedifs.length)
+          if config[:bridge]
+            @logger.debug("Bridge was directly specified in config, searching for: #{config[:bridge]}")
+
+            # Search for a matching bridged interface
+            bridgedifs.each do |interface|
+              if interface[:name].downcase == config[:bridge].downcase
+                @logger.debug("Specific bridge found as configured in the Vagrantfile. Using it.")
+                chosen_bridge = interface[:name]
+                break
+              end
+            end
 
-            # The choice that the user has chosen as the bridging interface
-            choice = nil
-            while !valid.include?(choice)
-              choice = @env[:ui].ask("What interface should the network bridge to? ")
-              choice = choice.to_i
+            # If one wasn't found, then we notify the user here.
+            if !chosen_bridge
+              @env[:ui].info I18n.t("vagrant.actions.vm.bridged_networking.specific_not_found",
+                                    :bridge => config[:bridge])
             end
+          end
 
-            chosen_bridge = bridgedifs[choice - 1][:name]
+          # If we still don't have a bridge chosen (this means that one wasn't
+          # specified in the Vagrantfile, or the bridge specified in the Vagrantfile
+          # wasn't found), then we fall back to the normal means of searchign for a
+          # bridged network.
+          if !chosen_bridge
+            if bridgedifs.length == 1
+              # One bridgable interface? Just use it.
+              chosen_bridge = bridgedifs[0][:name]
+              @logger.debug("Only one bridged interface available. Using it by default.")
+            else
+              # More than one bridgable interface requires a user decision, so
+              # show options to choose from.
+              @env[:ui].info I18n.t("vagrant.actions.vm.bridged_networking.available",
+                                    :prefix => false)
+              bridgedifs.each_index do |index|
+                interface = bridgedifs[index]
+                @env[:ui].info("#{index + 1}) #{interface[:name]}", :prefix => false)
+              end
+
+              # The range of valid choices
+              valid = Range.new(1, bridgedifs.length)
+
+              # The choice that the user has chosen as the bridging interface
+              choice = nil
+              while !valid.include?(choice)
+                choice = @env[:ui].ask("What interface should the network bridge to? ")
+                choice = choice.to_i
+              end
+
+              chosen_bridge = bridgedifs[choice - 1][:name]
+            end
           end
 
           @logger.info("Bridging adapter #{config[:adapter]} to #{chosen_bridge}")
@@ -354,7 +386,8 @@ module Vagrant
             :adapter     => config[:adapter],
             :type        => :bridged,
             :bridge      => chosen_bridge,
-            :mac_address => config[:mac]
+            :mac_address => config[:mac],
+            :nic_type    => config[:nic_type],
           }
         end
 

data/lib/vagrant/action/vm/nfs.rb

@@ -91,6 +91,7 @@ module Vagrant
             key, opts = data
             opts[:map_uid] = prepare_permission(:uid, opts)
             opts[:map_gid] = prepare_permission(:gid, opts)
+            opts[:nfs_version] ||= 3
 
             acc[key] = opts
             acc

data/lib/vagrant/driver/virtualbox_4_0.rb

@@ -112,6 +112,10 @@ module Vagrant
             args.concat(["--macaddress#{adapter[:adapter]}",
                          adapter[:mac_address]])
           end
+
+          if adapter[:nic_type]
+            args.concat(["--nictype#{adapter[:adapter]}", adapter[:nic_type].to_s])
+          end
         end
 
         execute("modifyvm", @uuid, *args)

data/lib/vagrant/driver/virtualbox_4_1.rb

@@ -112,6 +112,10 @@ module Vagrant
             args.concat(["--macaddress#{adapter[:adapter]}",
                          adapter[:mac_address]])
           end
+
+          if adapter[:nic_type]
+            args.concat(["--nictype#{adapter[:adapter]}", adapter[:nic_type].to_s])
+          end
         end
 
         execute("modifyvm", @uuid, *args)

data/lib/vagrant/guest/freebsd.rb

@@ -38,7 +38,10 @@ module Vagrant
         end
       end
 
-      # TODO: Error/warning about this.
+      # TODO: vboxsf is currently unsupported in FreeBSD, if you are able to
+      # help out with this project, please contact vbox@FreeBSD.org
+      #
+      # See: http://wiki.freebsd.org/VirtualBox/ToDo
       # def mount_shared_folder(ssh, name, guestpath)
       #   ssh.exec!("sudo mkdir -p #{guestpath}")
       #   # Using a custom mount method here; could use improvement.
@@ -53,23 +56,18 @@ module Vagrant
         end
       end
 
-      def prepare_host_only_network(net_options=nil)
+      def configure_networks(networks)
         # Remove any previous host only network additions to the
         # interface file.
-        vm.ssh.execute do |ssh|
-          # Clear out any previous entries
-          ssh.exec!("sudo sed -e '/^#VAGRANT-BEGIN-HOSTONLY/,/^#VAGRANT-END-HOSTONLY/ d' /etc/rc.conf > /tmp/rc.conf")
-          ssh.exec!("sudo mv /tmp/rc.conf /etc/rc.conf")
-        end
-      end
+        vm.channel.sudo("sed -e '/^#VAGRANT-BEGIN-HOSTONLY/,/^#VAGRANT-END-HOSTONLY/ d' /etc/rc.conf > /tmp/rc.conf")
+        vm.channel.sudo("mv /tmp/rc.conf /etc/rc.conf")
 
-      def enable_host_only_network(net_options)
-        entry = "#VAGRANT-BEGIN-HOSTONLY\nifconfig_em#{net_options[:adapter]}=\"inet #{net_options[:ip]} netmask #{net_options[:netmask]}\"\n#VAGRANT-END-HOSTONLY\n"
-        vm.ssh.upload!(StringIO.new(entry), "/tmp/vagrant-network-entry")
+        networks.each do |network|
+          entry = "#VAGRANT-BEGIN-HOSTONLY\nifconfig_em#{network[:interface]}=\"inet #{network[:ip]} netmask #{network[:netmask]}\"\n#VAGRANT-END-HOSTONLY\n"
+          vm.channel.upload(StringIO.new(entry), "/tmp/vagrant-network-entry")
 
-        vm.ssh.execute do |ssh|
-          ssh.exec!("sudo su -m root -c 'cat /tmp/vagrant-network-entry >> /etc/rc.conf'")
-          ssh.exec!("sudo ifconfig em#{net_options[:adapter]} inet #{net_options[:ip]} netmask #{net_options[:netmask]}")
+          vm.channel.sudo("su -m root -c 'cat /tmp/vagrant-network-entry >> /etc/rc.conf'")
+          vm.channel.sudo("ifconfig em#{network[:interface]} inet #{network[:ip]} netmask #{network[:netmask]}")
         end
       end
     end

data/lib/vagrant/guest/linux.rb

@@ -60,7 +60,7 @@ module Vagrant
 
           # Do the actual creating and mounting
           @vm.channel.sudo("mkdir -p #{real_guestpath}")
-          @vm.channel.sudo("mount #{ip}:'#{opts[:hostpath]}' #{real_guestpath}",
+          @vm.channel.sudo("mount -o vers=#{opts[:nfs_version]} #{ip}:'#{opts[:hostpath]}' #{real_guestpath}",
                           :error_class => LinuxError,
                           :error_key => :mount_nfs_fail)
         end

data/lib/vagrant/guest/redhat.rb

@@ -41,7 +41,7 @@ module Vagrant
         interfaces.each do |interface|
           vm.channel.sudo("/sbin/ifconfig eth#{interface} down 2> /dev/null")
           vm.channel.sudo("cat /tmp/vagrant-network-entry_#{interface} >> #{network_scripts_dir}/ifcfg-eth#{interface}")
-          vm.channel.sudo("/sbin/ifup eth#{interface}")
+          vm.channel.sudo("/sbin/ifconfig eth#{interface} up 2> /dev/null")
         end
       end
 

data/lib/vagrant/hosts/bsd.rb

@@ -24,6 +24,7 @@ module Vagrant
 
         @logger = Log4r::Logger.new("vagrant::hosts::bsd")
         @nfs_restart_command = "sudo nfsd restart"
+        @nfs_exports_template = "nfs/exports"
       end
 
       def nfs?
@@ -33,7 +34,7 @@ module Vagrant
       end
 
       def nfs_export(id, ip, folders)
-        output = TemplateRenderer.render('nfs/exports',
+        output = TemplateRenderer.render(@nfs_exports_template,
                                          :uuid => id,
                                          :ip => ip,
                                          :folders => folders)

data/lib/vagrant/hosts/freebsd.rb

@@ -4,6 +4,10 @@ module Vagrant
   module Hosts
     # Represents a FreeBSD host
     class FreeBSD < BSD
+      class FreeBSDHostError < Errors::VagrantError
+        error_namespace("vagrant.hosts.freebsd")
+      end
+
       include Util
       include Util::Retryable
 
@@ -16,10 +20,21 @@ module Vagrant
         5
       end
 
+      def nfs_export(id, ip, folders)
+        folders.each do |folder_name, folder_values|
+          if folder_values[:hostpath] =~ /\s+/
+            raise FreeBSDHostError, :_key => :nfs_whitespace
+          end
+        end
+
+        super
+      end
+
       def initialize(*args)
         super
 
         @nfs_restart_command = "sudo /etc/rc.d/mountd onereload"
+        @nfs_exports_template = "nfs/exports_freebsd"
       end
     end
   end

data/lib/vagrant/provisioners/puppet_server.rb

@@ -10,11 +10,8 @@ module Vagrant
         attr_accessor :puppet_node
         attr_accessor :options
 
-        def initialize
-          @puppet_server = "puppet"
-          @puppet_node = "puppet_node"
-          @options = []
-        end
+        def puppet_server; @puppet_server || "puppet"; end
+        def options; @options ||= []; end
       end
 
       def self.config_class
@@ -35,14 +32,28 @@ module Vagrant
 
       def run_puppetd_client
         options = config.options
-        options = options.join(" ") if options.is_a?(Array)
+        options = [options] if !options.is_a?(Array)
+
+        # Intelligently set the puppet node cert name based on certain
+        # external parameters.
+        cn = nil
         if config.puppet_node
+          # If a node name is given, we use that directly for the certname
           cn = config.puppet_node
+        elsif env[:vm].config.vm.host_name
+          # If a host name is given, we explicitly set the certname to
+          # nil so that the hostname becomes the cert name.
+          cn = nil
         else
+          # Otherwise, we default to the name of the box.
           cn = env[:vm].config.vm.box
         end
 
-        command = "puppetd #{options} --server #{config.puppet_server} --certname #{cn}"
+        # Add the certname option if there is one
+        options += ["--certname", cn] if cn
+        options = options.join(" ")
+
+        command = "puppetd #{options} --server #{config.puppet_server}"
 
         env[:ui].info I18n.t("vagrant.provisioners.puppet_server.running_puppetd")
         env[:vm].channel.sudo(command) do |type, data|

data/lib/vagrant/version.rb

@@ -2,5 +2,5 @@ module Vagrant
   # This will always be up to date with the current version of Vagrant,
   # since it is used to generate the gemspec and is also the source of
   # the version for `vagrant -v`
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

data/templates/locales/en.yml

@@ -299,6 +299,9 @@ en:
             Enabling bridged network...
           preparing: |-
             Preparing bridged networking...
+          specific_not_found: |-
+            Specific bridge '%{bridge}' not found. You may be asked to specify
+            which network to bridge to.
         check_box:
           not_found: Box %{name} was not found. Fetching box from specified URL...
           not_specified: |-
@@ -383,7 +386,8 @@ en:
           forwarding_entry: |-
             -- %{guest_port} => %{host_port} (adapter %{adapter})
           non_nat: |-
-            VirtualBox adapter #%{adapter} not configured as "NAT". Skipping: '%{name}'.
+            VirtualBox adapter #%{adapter} not configured as "NAT". Skipping port
+            forwards on this adapter.
           privileged_ports: |-
             You are trying to forward to privileged ports (ports <= 1024). Most
             operating systems restrict this to only privileged process (typically
@@ -554,6 +558,10 @@ en:
       arch:
         nfs_export:
           prepare: "Preparing to edit /etc/exports. Administrator privileges will be required..."
+      freebsd:
+        nfs_whitespace: |-
+          FreeBSD hosts do not support sharing directories with whitespace in
+          their path. Please adjust your path accordingly.
 
     provisioners:
       chef:

data/templates/nfs/exports_freebsd.erb

@@ -0,0 +1,5 @@
+# VAGRANT-BEGIN: <%= uuid %>
+<% folders.each do |name, opts| %>
+<%= opts[:hostpath] %> <%= ip %><% if opts[:map_uid] -%> -alldirs -mapall=<%= [opts[:map_uid],opts[:map_gid]].compact.join(":") %><% end -%>
+<% end %>
+# VAGRANT-END: <%= uuid %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-29 00:00:00 Z
+date: 2012-02-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -442,6 +442,7 @@ files:
 - templates/guests/redhat/network_static.erb
 - templates/locales/en.yml
 - templates/nfs/exports.erb
+- templates/nfs/exports_freebsd.erb
 - templates/nfs/exports_linux.erb
 - templates/package_Vagrantfile.erb
 - templates/provisioners/chef_client/client.erb