vagrant 0.7.0.beta → 0.7.0.beta2

data/lib/vagrant/provisioners/puppet_server.rb

@@ -0,0 +1,57 @@
+module Vagrant
+  module Provisioners
+    class PuppetServerError < Vagrant::Errors::VagrantError
+      error_namespace("vagrant.provisioners.puppet_server")
+    end
+
+    class PuppetServer < Base
+      register :puppet_server
+
+      class Config < Vagrant::Config::Base
+        attr_accessor :puppet_server
+        attr_accessor :puppet_node
+        attr_accessor :options
+
+        def initialize
+          @puppet_server = "puppet"
+          @puppet_node = "puppet_node"
+          @options = []
+        end
+      end
+
+      def provision!
+        verify_binary("puppetd")
+        run_puppetd_client
+      end
+
+      def verify_binary(binary)
+        vm.ssh.execute do |ssh|
+          ssh.shell do |sh|
+            sh.execute("sudo -i which #{binary}", :error_class => PuppetServerError, :_key => :puppetd_not_detected, :binary => binary)
+          end
+        end
+      end
+
+      def run_puppetd_client
+        options = config.options
+        options = options.join(" ") if options.is_a?(Array)
+        if config.puppet_node
+          cn = config.puppet_node
+        else
+          cn = env.config.vm.box
+        end
+
+        command = "sudo -i puppetd #{options} --server #{config.puppet_server} --certname #{cn}"
+
+        env.ui.info I18n.t("vagrant.provisioners.puppet_server.running_puppetd")
+
+        vm.ssh.execute do |ssh|
+          ssh.exec!(command) do |channel, type, data|
+            ssh.check_exit_status(data, command) if type == :exit_status
+            env.ui.info(data) if type != :exit_status
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/ssh.rb

@@ -3,6 +3,8 @@ require 'net/ssh'
 require 'net/scp'
 require 'mario'
 
+require 'vagrant/ssh/session'
+
 module Vagrant
   # Manages SSH access to a specific environment. Allows an environment to
   # replace the process with SSH itself, run a specific set of commands,
@@ -42,6 +44,7 @@ module Vagrant
                          "-o StrictHostKeyChecking=no", "-o IdentitiesOnly=yes",
                          "-i #{options[:private_key_path]}"]
       command_options << "-o ForwardAgent=yes" if env.config.ssh.forward_agent
+      command_options << "-o ForwardX11=yes" if env.config.ssh.forward_x11
 
       # Some hackery going on here. On Mac OS X Leopard (10.5), exec fails
       # (GH-51). As a workaround, we fork and wait. On all other platforms,
@@ -162,76 +165,4 @@ module Vagrant
       return env.config.ssh.port
     end
   end
-
-  class SSH
-    # A helper class which wraps around `Net::SSH::Connection::Session`
-    # in order to provide basic command error checking while still
-    # providing access to the actual session object.
-    class Session
-      include Util::Retryable
-
-      attr_reader :session
-
-      def initialize(session)
-        @session = session
-      end
-
-      # Executes a given command on the SSH session and blocks until
-      # the command completes. This is an almost line for line copy of
-      # the actual `exec!` implementation, except that this
-      # implementation also reports `:exit_status` to the block if given.
-      def exec!(command, options=nil, &block)
-        options = {
-          :error_check => true
-        }.merge(options || {})
-
-        block ||= Proc.new do |ch, type, data|
-          check_exit_status(data, command, options) if type == :exit_status && options[:error_check]
-
-          ch[:result] ||= ""
-          ch[:result] << data if [:stdout, :stderr].include?(type)
-        end
-
-        retryable(:tries => 5, :on => IOError, :sleep => 0.5) do
-          metach = session.open_channel do |channel|
-            channel.exec(command) do |ch, success|
-              raise "could not execute command: #{command.inspect}" unless success
-
-              # Output stdout data to the block
-              channel.on_data do |ch2, data|
-                block.call(ch2, :stdout, data)
-              end
-
-              # Output stderr data to the block
-              channel.on_extended_data do |ch2, type, data|
-                block.call(ch2, :stderr, data)
-              end
-
-              # Output exit status information to the block
-              channel.on_request("exit-status") do |ch2, data|
-                block.call(ch2, :exit_status, data.read_long)
-              end
-            end
-          end
-
-          metach.wait
-          metach[:result]
-        end
-      end
-
-      # Checks for an erroroneous exit status and raises an exception
-      # if so.
-      def check_exit_status(exit_status, command, options=nil)
-        if exit_status != 0
-          options = {
-            :_error_class => Errors::VagrantError,
-            :_key => :ssh_bad_exit_status,
-            :command => command
-          }.merge(options || {})
-
-          raise options[:_error_class], options
-        end
-      end
-    end
-  end
 end

data/lib/vagrant/ssh/session.rb

@@ -0,0 +1,81 @@
+module Vagrant
+  class SSH
+    # A helper class which wraps around `Net::SSH::Connection::Session`
+    # in order to provide basic command error checking while still
+    # providing access to the actual session object.
+    class Session
+      include Util::Retryable
+
+      attr_reader :session
+
+      def initialize(session)
+        @session = session
+      end
+
+      # Executes a given command and simply returns true/false if the
+      # command succeeded or not.
+      def test?(command)
+        exec!(command) do |ch, type, data|
+          return true if type == :exit_status && data == 0
+        end
+
+        false
+      end
+
+      # Executes a given command on the SSH session and blocks until
+      # the command completes. This is an almost line for line copy of
+      # the actual `exec!` implementation, except that this
+      # implementation also reports `:exit_status` to the block if given.
+      def exec!(command, options=nil, &block)
+        options = { :error_check => true }.merge(options || {})
+
+        block ||= Proc.new do |ch, type, data|
+          check_exit_status(data, command, options) if type == :exit_status && options[:error_check]
+
+          ch[:result] ||= ""
+          ch[:result] << data if [:stdout, :stderr].include?(type)
+        end
+
+        retryable(:tries => 5, :on => IOError, :sleep => 0.5) do
+          metach = session.open_channel do |channel|
+            channel.exec(command) do |ch, success|
+              raise "could not execute command: #{command.inspect}" unless success
+
+              # Output stdout data to the block
+              channel.on_data do |ch2, data|
+                block.call(ch2, :stdout, data)
+              end
+
+              # Output stderr data to the block
+              channel.on_extended_data do |ch2, type, data|
+                block.call(ch2, :stderr, data)
+              end
+
+              # Output exit status information to the block
+              channel.on_request("exit-status") do |ch2, data|
+                block.call(ch2, :exit_status, data.read_long)
+              end
+            end
+          end
+
+          metach.wait
+          metach[:result]
+        end
+      end
+
+      # Checks for an erroroneous exit status and raises an exception
+      # if so.
+      def check_exit_status(exit_status, command, options=nil)
+        if exit_status != 0
+          options = {
+            :_error_class => Errors::VagrantError,
+            :_key => :ssh_bad_exit_status,
+            :command => command
+          }.merge(options || {})
+
+          raise options[:_error_class], options
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/systems.rb

@@ -0,0 +1,9 @@
+# These can't be autoloaded because they have to register functionality
+# with Vagrant core.
+require 'vagrant/systems/base'
+require 'vagrant/systems/linux'
+require 'vagrant/systems/solaris'
+
+require 'vagrant/systems/debian'
+require 'vagrant/systems/gentoo'
+require 'vagrant/systems/redhat'

data/lib/vagrant/systems/base.rb

@@ -15,6 +15,10 @@ module Vagrant
     # required by systems can and will change at any time. Any
     # changes will be noted on release notes.**
     class Base
+      class BaseError < Errors::VagrantError
+        error_namespace("vagrant.systems.base")
+      end
+
       include Vagrant::Util
 
       # The VM which this system is tied to.
@@ -27,6 +31,15 @@ module Vagrant
         @vm = vm
       end
 
+      # This method is automatically called when the system is available (when
+      # Vagrant can successfully SSH into the machine) to give the system a chance
+      # to determine the distro and return a distro-specific system.
+      #
+      # **Warning:** If a return value which subclasses from {Base} is
+      # returned, Vagrant will use it as the new system instance for the
+      # class.
+      def distro_dispatch; end
+
       # Halt the machine. This method should gracefully shut down the
       # operating system. This method will cause `vagrant halt` and associated
       # commands to _block_, meaning that if the machine doesn't halt
@@ -55,7 +68,9 @@ module Vagrant
 
       # Prepares the system for host only networks. This is called
       # once prior to any `enable_host_only_network` calls.
-      def prepare_host_only_network; end
+      def prepare_host_only_network(net_options=nil)
+        raise BaseError, :_key => :unsupported_host_only
+      end
 
       # Setup the system by adding a new host only network. This
       # method should configure and bring up the interface for the

data/lib/vagrant/systems/debian.rb

@@ -0,0 +1,26 @@
+module Vagrant
+  module Systems
+    class Debian < Linux
+      def prepare_host_only_network(net_options=nil)
+        # 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/,/^#VAGRANT-END/ d' /etc/network/interfaces > /tmp/vagrant-network-interfaces")
+          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-interfaces > /etc/network/interfaces'")
+        end
+      end
+
+      def enable_host_only_network(net_options)
+        entry = TemplateRenderer.render('network_entry_debian', :net_options => net_options)
+        vm.ssh.upload!(StringIO.new(entry), "/tmp/vagrant-network-entry")
+
+        vm.ssh.execute do |ssh|
+          ssh.exec!("sudo /sbin/ifdown eth#{net_options[:adapter]} 2> /dev/null")
+          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-entry >> /etc/network/interfaces'")
+          ssh.exec!("sudo /sbin/ifup eth#{net_options[:adapter]}")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/systems/gentoo.rb

@@ -0,0 +1,27 @@
+module Vagrant
+  module Systems
+    class Gentoo < Linux
+      def prepare_host_only_network(net_options=nil)
+        # 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/,/^#VAGRANT-END/ d' /etc/conf.d/net > /tmp/vagrant-network-interfaces")
+          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-interfaces > /etc/conf.d/net'")
+        end
+      end
+
+      def enable_host_only_network(net_options)
+        entry = TemplateRenderer.render('network_entry_gentoo', :net_options => net_options)
+        vm.ssh.upload!(StringIO.new(entry), "/tmp/vagrant-network-entry")
+
+        vm.ssh.execute do |ssh|
+          ssh.exec!("sudo ln -s /etc/init.d/net.lo /etc/init.d/net.eth#{net_options[:adapter]}")
+          ssh.exec!("sudo /etc/init.d/net.eth#{net_options[:adapter]} stop 2> /dev/null")
+          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-entry >> /etc/conf.d/net'")
+          ssh.exec!("sudo /etc/init.d/net.eth#{net_options[:adapter]} start")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/systems/linux.rb

@@ -1,32 +1,20 @@
+require 'vagrant/systems/linux/error'
+require 'vagrant/systems/linux/config'
+
 module Vagrant
   module Systems
-    # A general Vagrant system implementation for "linux." In general,
-    # any linux-based OS will work fine with this system, although its
-    # not tested exhaustively. BSD or other based systems may work as
-    # well, but that hasn't been tested at all.
-    #
-    # At any rate, this system implementation should server as an
-    # example of how to implement any custom systems necessary.
     class Linux < Base
-      # A custom config class which will be made accessible via `config.linux`
-      # This is not necessary for all system implementers, of course. However,
-      # generally, Vagrant tries to make almost every aspect of its execution
-      # configurable, and this assists that goal.
-      class LinuxConfig < Vagrant::Config::Base
-        configures :linux
-
-        attr_accessor :halt_timeout
-        attr_accessor :halt_check_interval
-
-        def initialize
-          @halt_timeout = 30
-          @halt_check_interval = 1
+      def distro_dispatch
+        vm.ssh.execute do |ssh|
+          return :debian if ssh.test?("cat /etc/debian_version")
+          return :gentoo if ssh.test?("cat /etc/gentoo-release")
+          return :redhat if ssh.test?("cat /etc/redhat-release")
         end
+
+        # Can't detect the distro, assume vanilla linux
+        nil
       end
 
-      #-------------------------------------------------------------------
-      # Overridden methods
-      #-------------------------------------------------------------------
       def halt
         vm.env.ui.info I18n.t("vagrant.systems.linux.attempting_halt")
         vm.ssh.execute do |ssh|
@@ -57,43 +45,19 @@ module Vagrant
         folders.each do |name, opts|
           vm.ssh.execute do |ssh|
             ssh.exec!("sudo mkdir -p #{opts[:guestpath]}")
-            ssh.exec!("sudo mount #{ip}:#{opts[:hostpath]} #{opts[:guestpath]}")
+            ssh.exec!("sudo mount #{ip}:#{opts[:hostpath]} #{opts[:guestpath]}", :error_class => LinuxError, :_key => :mount_nfs_fail)
           end
         end
       end
 
-      def prepare_host_only_network
-        # Remove any previous host only network additions to the
-        # interface file.
-        vm.ssh.execute do |ssh|
-          # Verify debian/ubuntu
-          ssh.exec!("cat /etc/debian_version", :error_class => LinuxError, :_key => :network_not_debian)
-
-          # Clear out any previous entries
-          ssh.exec!("sudo sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/network/interfaces > /tmp/vagrant-network-interfaces")
-          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-interfaces > /etc/network/interfaces'")
-        end
-      end
-
-      def enable_host_only_network(net_options)
-        entry = TemplateRenderer.render('network_entry', :net_options => net_options)
-        vm.ssh.upload!(StringIO.new(entry), "/tmp/vagrant-network-entry")
-
-        vm.ssh.execute do |ssh|
-          ssh.exec!("sudo /sbin/ifdown eth#{net_options[:adapter]} 2> /dev/null")
-          ssh.exec!("sudo su -c 'cat /tmp/vagrant-network-entry >> /etc/network/interfaces'")
-          ssh.exec!("sudo /sbin/ifup eth#{net_options[:adapter]}")
-        end
-      end
-
       #-------------------------------------------------------------------
       # "Private" methods which assist above methods
       #-------------------------------------------------------------------
       def mount_folder(ssh, name, guestpath, sleeptime=5)
         # Determine the permission string to attach to the mount command
         perms = []
-        perms << "uid=#{vm.env.config.vm.shared_folder_uid}"
-        perms << "gid=#{vm.env.config.vm.shared_folder_gid}"
+        perms << "uid=`id -u #{vm.env.config.vm.shared_folder_uid}`"
+        perms << "gid=`id -g #{vm.env.config.vm.shared_folder_gid}`"
         perms = " -o #{perms.join(",")}" if !perms.empty?
 
         attempts = 0
@@ -111,11 +75,5 @@ module Vagrant
         end
       end
     end
-
-    class Linux < Base
-      class LinuxError < Errors::VagrantError
-        error_namespace("vagrant.systems.linux")
-      end
-    end
   end
 end

data/lib/vagrant/systems/linux/config.rb

@@ -0,0 +1,21 @@
+module Vagrant
+  module Systems
+    class Linux < Vagrant::Systems::Base
+      # A custom config class which will be made accessible via `config.linux`
+      # This is not necessary for all system implementers, of course. However,
+      # generally, Vagrant tries to make almost every aspect of its execution
+      # configurable, and this assists that goal.
+      class LinuxConfig < Vagrant::Config::Base
+        configures :linux
+
+        attr_accessor :halt_timeout
+        attr_accessor :halt_check_interval
+
+        def initialize
+          @halt_timeout = 30
+          @halt_check_interval = 1
+        end
+      end
+    end
+  end
+end