vagrant-unbundled 2.2.9.0 → 2.2.10.0

data/plugins/guests/pld/cap/change_host_name.rb

@@ -1,27 +1,21 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestPld
     module Cap
       class ChangeHostName
-        def self.change_host_name(machine, name)
-          comm = machine.communicate
-
-          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
-            basename = name.split(".", 2)[0]
-            comm.sudo <<-EOH.gsub(/^ {14}/, '')
-              hostname '#{name}'
-              sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
-              sed -i 's/\\(DHCP_HOSTNAME=\\).*/\\1\"#{name}\"/' /etc/sysconfig/interfaces/ifcfg-*
+        def self.change_name_command(name)
+          return <<-EOH.gsub(/^ {14}/, "")
+          hostname '#{name}'
+          sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network
 
-              # Prepend ourselves to /etc/hosts
-              grep -w '#{name}' /etc/hosts || {
-                sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
-              }
+          sed -i 's/\\(DHCP_HOSTNAME=\\).*/\\1\"#{name}\"/' /etc/sysconfig/interfaces/ifcfg-*
 
-              # Restart networking
-              service network restart
-            EOH
-          end
+          # Restart networking
+          service network restart
+          EOH
         end
       end
     end

data/plugins/guests/redhat/cap/change_host_name.rb

@@ -1,9 +1,12 @@
+require 'vagrant/util/guest_hosts'
+
 module VagrantPlugins
   module GuestRedHat
     module Cap
       class ChangeHostName
 
         extend Vagrant::Util::GuestInspection::Linux
+        extend Vagrant::Util::GuestHosts::Linux
 
         def self.change_host_name(machine, name)
           comm = machine.communicate
@@ -15,11 +18,6 @@ module VagrantPlugins
               sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network
               # Update DNS
               sed -i 's/\\(DHCP_HOSTNAME=\\).*/\\1\"#{basename}\"/' /etc/sysconfig/network-scripts/ifcfg-*
-              # Set the hostname - use hostnamectl if available
-              echo '#{name}' > /etc/hostname
-              grep -w '#{name}' /etc/hosts || {
-                sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
-              }
             EOH
 
             if hostnamectl?(comm)
@@ -40,6 +38,13 @@ module VagrantPlugins
             end
             comm.sudo(restart_command)
           end
+          
+          network_with_hostname = machine.config.vm.networks.map {|_, c| c if c[:hostname] }.compact[0]
+          if network_with_hostname
+            replace_host(comm, name, network_with_hostname[:ip])
+          else
+            add_hostname_to_loopback_interface(comm, name)
+          end
         end
       end
     end

data/plugins/guests/slackware/cap/change_host_name.rb

@@ -1,25 +1,19 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestSlackware
     module Cap
       class ChangeHostName
-        def self.change_host_name(machine, name)
-          comm = machine.communicate
-
-          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
-            basename = name.split(".", 2)[0]
-            comm.sudo <<-EOH.gsub(/^ {14}/, '')
-              # Set the hostname
-              chmod o+w /etc/hostname
-              echo '#{name}' > /etc/hostname
-              chmod o-w /etc/hostname
-              hostname -F /etc/hostname
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
-              # Prepend ourselves to /etc/hosts
-              grep -w '#{name}' /etc/hosts || {
-                sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
-              }
-            EOH
-          end
+        def self.change_name_command(name)
+          return <<-EOH.gsub(/^ {14}/, "")
+          # Set the hostname
+          chmod o+w /etc/hostname
+          echo '#{name}' > /etc/hostname
+          chmod o-w /etc/hostname
+          hostname -F /etc/hostname
+          EOH
         end
       end
     end

data/plugins/guests/solaris11/plugin.rb

@@ -29,6 +29,11 @@ module VagrantPlugins
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
+
+      guest_capability(:solaris11, :shell_expand_guest_path) do
+        require_relative "../linux/cap/shell_expand_guest_path"
+        VagrantPlugins::GuestLinux::Cap::ShellExpandGuestPath
+      end
     end
   end
 end

data/plugins/guests/suse/cap/change_host_name.rb

@@ -1,21 +1,22 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestSUSE
     module Cap
       class ChangeHostName
-        def self.change_host_name(machine, name)
-          comm = machine.communicate
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
+        def self.change_host_name?(comm, name)
           basename = name.split(".", 2)[0]
-          if !comm.test('test "$(hostnamectl --static status)" = "#{basename}"', sudo: false)
-            comm.sudo <<-EOH.gsub(/^ {14}/, '')
-              hostnamectl set-hostname '#{basename}'
+          !comm.test("test \"$(hostnamectl --static status)\" = \"#{basename}\"", sudo: false)
+        end
 
-              # Prepend ourselves to /etc/hosts
-              grep -w '#{name}' /etc/hosts || {
-                sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
-              }
-            EOH
-          end
+        def self.change_name_command(name)
+          basename = name.split(".", 2)[0]
+          return <<-EOH.gsub(/^ {14}/, "")
+          hostnamectl set-hostname '#{basename}'
+          echo #{name} > /etc/HOSTNAME
+          EOH
         end
       end
     end

data/plugins/hosts/darwin/cap/fs_iso.rb

@@ -0,0 +1,49 @@
+require "pathname"
+require "vagrant/util/caps"
+
+module VagrantPlugins
+  module HostDarwin
+    module Cap
+      class FsISO
+        extend Vagrant::Util::Caps::BuildISO
+        
+        @@logger = Log4r::Logger.new("vagrant::host::darwin::fs_iso")
+
+        BUILD_ISO_CMD = "hdiutil".freeze
+
+        # Check that the host has the ability to generate ISOs
+        #
+        # @param [Vagrant::Environment] env
+        # @return [Boolean]
+        def self.isofs_available(env)
+          !!Vagrant::Util::Which.which(BUILD_ISO_CMD)
+        end
+
+        # Generate an ISO file of the given source directory
+        #
+        # @param [Vagrant::Environment] env
+        # @param [String] source_directory Contents of ISO
+        # @param [Map] extra arguments to pass to the iso building command
+        #              :file_destination (string) location to store ISO
+        #              :volume_id (String) to set the volume name 
+        # @return [Pathname] ISO location
+        # @note If file_destination exists, source_directory will be checked
+        #       for recent modifications and a new ISO will be generated if requried.
+        def self.create_iso(env, source_directory, extra_opts={})
+          source_directory = Pathname.new(source_directory)
+          file_destination = self.ensure_output_iso(extra_opts[:file_destination])
+
+          iso_command = [BUILD_ISO_CMD, "makehybrid", "-hfs", "-iso", "-joliet", "-ov"]
+          iso_command.concat(["-default-volume-name", extra_opts[:volume_id]]) if extra_opts[:volume_id]
+          iso_command << "-o"
+          iso_command << file_destination.to_s
+          iso_command << source_directory.to_s
+          self.build_iso(iso_command, source_directory, file_destination)
+
+          @@logger.info("ISO available at #{file_destination}")
+          file_destination
+        end
+      end
+    end
+  end
+end

data/plugins/hosts/darwin/plugin.rb

@@ -11,6 +11,16 @@ module VagrantPlugins
         Host
       end
 
+      host_capability("darwin", "isofs_available") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
+      host_capability("darwin", "create_iso") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
       host_capability("darwin", "provider_install_virtualbox") do
         require_relative "cap/provider_install_virtualbox"
         Cap::ProviderInstallVirtualBox

data/plugins/hosts/linux/cap/fs_iso.rb

@@ -0,0 +1,49 @@
+require "pathname"
+require "vagrant/util/caps"
+
+module VagrantPlugins
+  module HostLinux
+    module Cap
+      class FsISO
+        extend Vagrant::Util::Caps::BuildISO
+
+        @@logger = Log4r::Logger.new("vagrant::host::linux::fs_iso")
+
+        BUILD_ISO_CMD = "mkisofs".freeze
+
+        # Check that the host has the ability to generate ISOs
+        #
+        # @param [Vagrant::Environment] env
+        # @return [Boolean]
+        def self.isofs_available(env)
+          !!Vagrant::Util::Which.which(BUILD_ISO_CMD)
+        end
+
+        # Generate an ISO file of the given source directory
+        #
+        # @param [Vagrant::Environment] env
+        # @param [String] source_directory Contents of ISO
+        # @param [Map] extra arguments to pass to the iso building command
+        #              :file_destination (string) location to store ISO
+        #              :volume_id (String) to set the volume name
+        # @return [Pathname] ISO location
+        # @note If file_destination exists, source_directory will be checked
+        #       for recent modifications and a new ISO will be generated if requried.
+        def self.create_iso(env, source_directory, extra_opts={})
+          source_directory = Pathname.new(source_directory)
+          file_destination = self.ensure_output_iso(extra_opts[:file_destination])
+
+          iso_command = [BUILD_ISO_CMD, "-joliet"]
+          iso_command.concat(["-volid", extra_opts[:volume_id]]) if extra_opts[:volume_id]
+          iso_command << "-o"
+          iso_command << file_destination.to_s
+          iso_command << source_directory.to_s
+          self.build_iso(iso_command, source_directory, file_destination)
+
+          @@logger.info("ISO available at #{file_destination}")
+          file_destination
+        end
+      end
+    end
+  end
+end

data/plugins/hosts/linux/cap/rdp.rb

@@ -48,7 +48,7 @@ module VagrantPlugins
           end
 
           # Finally, run the client.
-          Vagrant::Util::Subprocess.execute(rdp_client, *args)
+          Vagrant::Util::Subprocess.execute(rdp_client, *args, {:detach => true})
         end
       end
     end

data/plugins/hosts/linux/plugin.rb

@@ -11,6 +11,16 @@ module VagrantPlugins
         Host
       end
 
+      host_capability("linux", "isofs_available") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
+      host_capability("linux", "create_iso") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
       host_capability("linux", "nfs_export") do
         require_relative "cap/nfs"
         Cap::NFS

data/plugins/hosts/windows/cap/fs_iso.rb

@@ -0,0 +1,48 @@
+require "pathname"
+require "vagrant/util/caps"
+
+module VagrantPlugins
+  module HostWindows
+    module Cap
+      class FsISO
+        extend Vagrant::Util::Caps::BuildISO
+
+        @@logger = Log4r::Logger.new("vagrant::host::windows::fs_iso")
+
+        BUILD_ISO_CMD = "oscdimg".freeze
+
+        # Check that the host has the ability to generate ISOs
+        #
+        # @param [Vagrant::Environment] env
+        # @return [Boolean]
+        def self.isofs_available(env)
+          !!Vagrant::Util::Which.which(BUILD_ISO_CMD)
+        end
+
+        # Generate an ISO file of the given source directory
+        #
+        # @param [Vagrant::Environment] env
+        # @param [String] source_directory Contents of ISO
+        # @param [Map] extra arguments to pass to the iso building command
+        #              :file_destination (string) location to store ISO
+        #              :volume_id (String) to set the volume name
+        # @return [Pathname] ISO location
+        # @note If file_destination exists, source_directory will be checked
+        #       for recent modifications and a new ISO will be generated if requried.
+        def self.create_iso(env, source_directory, extra_opts={})
+          source_directory = Pathname.new(source_directory)
+          file_destination = self.ensure_output_iso(extra_opts[:file_destination])
+
+          iso_command = [BUILD_ISO_CMD, "-j1", "-o", "-m"]
+          iso_command << "-l#{extra_opts[:volume_id]}" if extra_opts[:volume_id]
+          iso_command << source_directory.to_s
+          iso_command << file_destination.to_s
+          self.build_iso(iso_command, source_directory, file_destination)
+
+          @@logger.info("ISO available at #{file_destination}")
+          file_destination
+        end
+      end
+    end
+  end
+end

data/plugins/hosts/windows/cap/rdp.rb

@@ -22,7 +22,7 @@ module VagrantPlugins
             args = rdp_info[:extra_args] + args
           end
           # Launch it
-          Vagrant::Util::Subprocess.execute("mstsc", *args)
+          Vagrant::Util::Subprocess.execute("mstsc", *args, {:detach => true})
         end
       end
     end

data/plugins/hosts/windows/plugin.rb

@@ -11,6 +11,16 @@ module VagrantPlugins
         Host
       end
 
+      host_capability("windows", "isofs_available") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
+      host_capability("windows", "create_iso") do
+        require_relative "cap/fs_iso"
+        Cap::FsISO
+      end
+
       host_capability("windows", "provider_install_virtualbox") do
         require_relative "cap/provider_install_virtualbox"
         Cap::ProviderInstallVirtualBox
@@ -60,6 +70,11 @@ module VagrantPlugins
         require_relative "cap/ssh"
         Cap::SSH
       end
+
+      host_capability("windows", "smb_validate_password") do
+        require_relative "cap/smb"
+        Cap::SMB
+      end
     end
   end
 end

data/plugins/kernel_v2/config/cloud_init.rb

@@ -0,0 +1,126 @@
+require "log4r"
+require "securerandom"
+
+module VagrantPlugins
+  module Kernel_V2
+    class VagrantConfigCloudInit < Vagrant.plugin("2", :config)
+      #-------------------------------------------------------------------
+      # Config class for cloud-init
+      #-------------------------------------------------------------------
+
+      DEFAULT_CONTENT_TYPES = ["text/cloud-boothook", "text/cloud-config",
+                               "text/cloud-config-archive", "text/jinja2",
+                               "text/part-handler", "text/upstart-job",
+                               "text/x-include-once-url", "text/x-include-url",
+                               "text/x-shellscript"].map(&:freeze).freeze
+
+      DEFAULT_CONFIG_TYPE = :user_data
+
+      # @note This value is for internal use only
+      #
+      # @return [String]
+      attr_reader :id
+
+      # The 'type' of data being stored. If not defined,
+      # will default to :user_data
+      #
+      # @return [Symbol]
+      attr_accessor :type
+
+      # @return [String]
+      attr_accessor :content_type
+
+      # @return [String]
+      attr_accessor :path
+
+      # @return [String]
+      attr_accessor :inline
+
+      def initialize(type=nil)
+        @logger = Log4r::Logger.new("vagrant::config::vm::cloud_init")
+
+        @type = type if type
+
+        @content_type = UNSET_VALUE
+        @path = UNSET_VALUE
+        @inline = UNSET_VALUE
+
+        # Internal options
+        @id = SecureRandom.uuid
+      end
+
+      def finalize!
+        if !@type
+          @type = DEFAULT_CONFIG_TYPE
+        else
+          @type = @type.to_sym
+        end
+
+        @content_type = nil if @content_type == UNSET_VALUE
+        @path = nil if @path == UNSET_VALUE
+        @inline = nil if @inline == UNSET_VALUE
+      end
+
+      # @return [Array] array of strings of error messages from config option validation
+      def validate(machine)
+        errors = _detected_errors
+
+        if @type && @type != DEFAULT_CONFIG_TYPE
+          errors << I18n.t("vagrant.cloud_init.incorrect_type_set",
+                           type: @type,
+                           machine: machine.name,
+                           default_type: DEFAULT_CONFIG_TYPE)
+        end
+
+        if !@content_type
+          errors << I18n.t("vagrant.cloud_init.content_type_not_set",
+                           machine: machine.name,
+                           accepted_types: DEFAULT_CONTENT_TYPES.join(', '))
+        elsif !DEFAULT_CONTENT_TYPES.include?(@content_type)
+          errors << I18n.t("vagrant.cloud_init.incorrect_content_type",
+                           machine: machine.name,
+                           content_type: @content_type,
+                           accepted_types: DEFAULT_CONTENT_TYPES.join(', '))
+        end
+
+        if @path && @inline
+          errors << I18n.t("vagrant.cloud_init.path_and_inline_set",
+                           machine: machine.name)
+        end
+
+        if @path
+          if !@path.is_a?(String)
+            errors << I18n.t("vagrant.cloud_init.incorrect_path_type",
+                              machine: machine.name,
+                              path: @path,
+                              type: @path.class.name)
+          else
+            expanded_path = Pathname.new(@path).expand_path(machine.env.root_path)
+            if !expanded_path.file?
+              errors << I18n.t("vagrant.cloud_init.path_invalid",
+                               path: expanded_path,
+                               machine: machine.name)
+            end
+          end
+        end
+
+        if @inline
+          if !@inline.is_a?(String)
+            errors << I18n.t("vagrant.cloud_init.incorrect_inline_type",
+                             machine: machine.name,
+                             type: @inline.class.name)
+          end
+        end
+
+        errors
+      end
+
+      # The String representation of this config.
+      #
+      # @return [String]
+      def to_s
+        "cloud_init config"
+      end
+    end
+  end
+end