tnargav 1.2.3 → 1.3.3

data/plugins/providers/virtualbox/util/compile_forwarded_ports.rb

@@ -15,10 +15,14 @@ module VagrantPlugins
             if type == :forwarded_port
               guest_port = options[:guest]
               host_port  = options[:host]
+              protocol   = options[:protocol] || "tcp"
               options    = scoped_hash_override(options, :virtualbox)
               id         = options[:id]
 
-              mappings[host_port] =
+              # If the forwarded port was marked as disabled, ignore.
+              next if options[:disabled]
+
+              mappings[host_port.to_s + protocol.to_s] =
                 Model::ForwardedPort.new(id, host_port, guest_port, options)
             end
           end

data/plugins/provisioners/ansible/config.rb

@@ -3,37 +3,54 @@ module VagrantPlugins
     class Config < Vagrant.plugin("2", :config)
       attr_accessor :playbook
       attr_accessor :extra_vars
-      attr_accessor :inventory_file
+      attr_accessor :inventory_path
       attr_accessor :ask_sudo_pass
       attr_accessor :limit
       attr_accessor :sudo
       attr_accessor :sudo_user
       attr_accessor :verbose
+      attr_accessor :tags
+      attr_accessor :skip_tags
+      attr_accessor :start_at_task
+      attr_accessor :host_key_checking
+
+      # Joker attribute, used to pass unsupported arguments to ansible anyway
+      attr_accessor :raw_arguments
 
       def initialize
-        @playbook       = UNSET_VALUE
-        @extra_vars     = UNSET_VALUE
-        @inventory_file = UNSET_VALUE
-        @ask_sudo_pass  = UNSET_VALUE
-        @limit          = UNSET_VALUE
-        @sudo           = UNSET_VALUE
-        @sudo_user      = UNSET_VALUE
-        @verbose        = UNSET_VALUE
+        @playbook          = UNSET_VALUE
+        @extra_vars        = UNSET_VALUE
+        @inventory_path    = UNSET_VALUE
+        @ask_sudo_pass     = UNSET_VALUE
+        @limit             = UNSET_VALUE
+        @sudo              = UNSET_VALUE
+        @sudo_user         = UNSET_VALUE
+        @verbose           = UNSET_VALUE
+        @tags              = UNSET_VALUE
+        @skip_tags         = UNSET_VALUE
+        @start_at_task     = UNSET_VALUE
+        @raw_arguments     = UNSET_VALUE
+        @host_key_checking = "true"
       end
 
       def finalize!
-        @playbook       = nil if @playbook == UNSET_VALUE
-        @extra_vars     = nil if @extra_vars == UNSET_VALUE
-        @inventory_file = nil if @inventory_file == UNSET_VALUE
-        @ask_sudo_pass  = nil if @ask_sudo_pass == UNSET_VALUE
-        @limit          = nil if @limit == UNSET_VALUE
-        @sudo           = nil if @sudo == UNSET_VALUE
-        @sudo_user      = nil if @sudo_user == UNSET_VALUE
-        @verbose        = nil if @verbose == UNSET_VALUE
+        @playbook          = nil if @playbook == UNSET_VALUE
+        @extra_vars        = nil if @extra_vars == UNSET_VALUE
+        @inventory_path    = nil if @inventory_path == UNSET_VALUE
+        @ask_sudo_pass     = nil if @ask_sudo_pass == UNSET_VALUE
+        @limit             = nil if @limit == UNSET_VALUE
+        @sudo              = nil if @sudo == UNSET_VALUE
+        @sudo_user         = nil if @sudo_user == UNSET_VALUE
+        @verbose           = nil if @verbose == UNSET_VALUE
+        @tags              = nil if @tags == UNSET_VALUE
+        @skip_tags         = nil if @skip_tags == UNSET_VALUE
+        @start_at_task     = nil if @start_at_task == UNSET_VALUE
+        @raw_arguments     = nil if @raw_arguments == UNSET_VALUE
+        @host_key_checking = nil if @host_key_checking == UNSET_VALUE
       end
 
       def validate(machine)
-        errors = []
+        errors = _detected_errors
 
         # Validate that a playbook path was provided
         if !playbook
@@ -56,11 +73,11 @@ module VagrantPlugins
           end
         end
 
-        # Validate the existence of the inventory_file, if specified
-        if inventory_file
-          expanded_path = Pathname.new(inventory_file).expand_path(machine.env.root_path)
-          if !expanded_path.file?
-            errors << I18n.t("vagrant.provisioners.ansible.inventory_file_path_invalid",
+        # Validate the existence of the inventory_path, if specified
+        if inventory_path
+          expanded_path = Pathname.new(inventory_path).expand_path(machine.env.root_path)
+          if !expanded_path.exist?
+            errors << I18n.t("vagrant.provisioners.ansible.inventory_path_invalid",
                               :path => expanded_path)
           end
         end

data/plugins/provisioners/ansible/provisioner.rb

@@ -4,42 +4,97 @@ module VagrantPlugins
       def provision
         ssh = @machine.ssh_info
 
+        # Connect with Vagrant user (unless --user or --private-key are overidden by 'raw_arguments')
         options = %W[--private-key=#{ssh[:private_key_path]} --user=#{ssh[:username]}]
-        options << "--extra-vars=" + config.extra_vars.map{|k,v| "#{k}=#{v}"}.join(' ') if config.extra_vars
-        options << "--inventory-file=#{config.inventory_file}" if config.inventory_file
-        options << "--ask-sudo-pass" if config.ask_sudo_pass
 
-        if config.limit
-          if not config.limit.kind_of?(Array)
-            config.limit = [config.limit]
+        # Joker! Not (yet) supported arguments can be passed this way.
+        options << "#{config.raw_arguments}" if config.raw_arguments
+
+        # Append Provisioner options (higher precedence):
+        if config.extra_vars
+          extra_vars = config.extra_vars.map do |k,v|
+            v = v.gsub('"', '\\"')
+            if v.include?(' ')
+              v = v.gsub("'", "\\'")
+              v = "'#{v}'"
+            end
+
+            "#{k}=#{v}"
           end
-          config.limit = config.limit.join(",")
-          options << "--limit=#{config.limit}"
+          options << "--extra-vars=\"#{extra_vars.join(" ")}\""
         end
 
+        options << "--inventory-file=#{self.setup_inventory_file}"
         options << "--sudo" if config.sudo
         options << "--sudo-user=#{config.sudo_user}" if config.sudo_user
-        options << "--verbose" if config.verbose
+        options << "#{self.get_verbosity_argument}"
+        options << "--ask-sudo-pass" if config.ask_sudo_pass
+        options << "--tags=#{as_list_argument(config.tags)}" if config.tags
+        options << "--skip-tags=#{as_list_argument(config.skip_tags)}" if config.skip_tags
+        options << "--limit=#{as_list_argument(config.limit)}" if config.limit
+        options << "--start-at-task=#{config.start_at_task}" if config.start_at_task
 
         # Assemble the full ansible-playbook command
         command = (%w(ansible-playbook) << options << config.playbook).flatten
 
         # Write stdout and stderr data, since it's the regular Ansible output
         command << {
-          :env => { "ANSIBLE_FORCE_COLOR" => "true" },
-          :notify => [:stdout, :stderr]
+          :env => {
+            "ANSIBLE_FORCE_COLOR" => "true",
+            "ANSIBLE_HOST_KEY_CHECKING" => "#{config.host_key_checking}"
+          },
+          :notify => [:stdout, :stderr],
+          :workdir => @machine.env.root_path.to_s
         }
 
         begin
-          Vagrant::Util::Subprocess.execute(*command) do |type, data|
+          result = Vagrant::Util::Subprocess.execute(*command) do |type, data|
             if type == :stdout || type == :stderr
-              @machine.env.ui.info(data.chomp, :prefix => false)
+              @machine.env.ui.info(data, :new_line => false, :prefix => false)
             end
           end
+
+          raise Vagrant::Errors::AnsibleFailed if result.exit_code != 0
         rescue Vagrant::Util::Subprocess::LaunchError
           raise Vagrant::Errors::AnsiblePlaybookAppNotFound
         end
       end
+
+      protected
+
+      # Auto-generate "safe" inventory file based on Vagrantfile,
+      # unless inventory_path is explicitly provided
+      def setup_inventory_file
+        return config.inventory_path if config.inventory_path
+
+        ssh = @machine.ssh_info
+
+        generated_inventory_file =
+          @machine.env.root_path.join("vagrant_ansible_inventory_#{machine.name}")
+
+        generated_inventory_file.open('w') do |file|
+          file.write("# Generated by Vagrant\n\n")
+          file.write("#{machine.name} ansible_ssh_host=#{ssh[:host]} ansible_ssh_port=#{ssh[:port]}\n")
+        end
+
+        return generated_inventory_file.to_s
+      end
+
+      def get_verbosity_argument
+        if config.verbose.to_s =~ /^v+$/
+          # Hopefully ansible-playbook accepts "silly" arguments like '-vvvvv', as '-vvv'
+          return "-#{config.verbose}"
+        elsif config.verbose.to_s == 'extra'
+          return '-vvv'
+        else
+          # fall back to default verbosity
+          return '--verbose'
+        end
+      end
+
+      def as_list_argument(v)
+        v.kind_of?(Array) ? v.join(',') : v
+      end
     end
   end
 end

data/plugins/provisioners/cfengine/cap/debian/cfengine_install.rb

@@ -9,7 +9,7 @@ module VagrantPlugins
               comm.sudo("GPGFILE=`tempfile`; wget -O $GPGFILE #{config.repo_gpg_key_url} && apt-key add $GPGFILE; rm -f $GPGFILE")
 
               comm.sudo("apt-get update")
-              comm.sudo("apt-get install -y cfengine-community")
+              comm.sudo("apt-get install -y #{config.package_name}")
             end
           end
         end

data/plugins/provisioners/cfengine/cap/redhat/cfengine_install.rb

@@ -14,7 +14,7 @@ module VagrantPlugins
               logger.info("Installing CFEngine Community Yum Repository GPG KEY from #{config.repo_gpg_key_url}")
               comm.sudo("GPGFILE=$(mktemp) && wget -O $GPGFILE #{config.repo_gpg_key_url} && rpm --import $GPGFILE; rm -f $GPGFILE")
 
-              comm.sudo("yum -y install cfengine-community")
+              comm.sudo("yum -y install #{config.package_name}")
             end
           end
         end

data/plugins/provisioners/cfengine/config.rb

@@ -20,6 +20,7 @@ module VagrantPlugins
       attr_accessor :upload_path
       attr_accessor :yum_repo_file
       attr_accessor :yum_repo_url
+      attr_accessor :package_name
 
       def initialize
         @am_policy_hub    = UNSET_VALUE
@@ -37,6 +38,7 @@ module VagrantPlugins
         @upload_path      = UNSET_VALUE
         @yum_repo_file    = UNSET_VALUE
         @yum_repo_url     = UNSET_VALUE
+        @package_name     = UNSET_VALUE
       end
 
       def finalize!
@@ -81,10 +83,14 @@ module VagrantPlugins
         if @yum_repo_url == UNSET_VALUE
           @yum_repo_url = "http://cfengine.com/pub/yum/"
         end
+
+        if @package_name == UNSET_VALUE
+            @package_name = "cfengine-community"
+        end
       end
 
       def validate(machine)
-        errors = []
+        errors = _detected_errors
 
         valid_modes = [:bootstrap, :single_run]
         errors << I18n.t("vagrant.cfengine_config.invalid_mode") if !valid_modes.include?(@mode)

data/plugins/provisioners/cfengine/provisioner.rb

@@ -41,10 +41,9 @@ module VagrantPlugins
           if [:stderr, :stdout].include?(type)
             # Output the data with the proper color based on the stream.
             color = type == :stdout ? :green : :red
-
-            # Note: Be sure to chomp the data to avoid the newlines that the
-            # Chef outputs.
-            @machine.ui.info(data.chomp, :color => color, :prefix => false)
+            @machine.ui.info(
+              data,
+              :color => color, :new_line => false, :prefix => false)
           end
         end
       end
@@ -87,7 +86,7 @@ module VagrantPlugins
 
         @machine.ui.info(I18n.t("vagrant.cfengine_bootstrapping",
                                 policy_server: policy_server_address))
-        result = cfagent("--bootstrap --policy-server #{policy_server_address}", error_check: false)
+        result = cfagent("--bootstrap #{policy_server_address}", error_check: false)
         raise Vagrant::Errors::CFEngineBootstrapFailed if result != 0
 
         # Policy hubs need to do additional things before they're ready

data/plugins/provisioners/chef/config/base.rb

@@ -6,6 +6,8 @@ module VagrantPlugins
         attr_accessor :attempts
         attr_accessor :binary_path
         attr_accessor :binary_env
+        attr_accessor :custom_config_path
+        attr_accessor :formatter
         attr_accessor :http_proxy
         attr_accessor :http_proxy_user
         attr_accessor :http_proxy_pass
@@ -18,6 +20,9 @@ module VagrantPlugins
         attr_accessor :node_name
         attr_accessor :provisioning_path
         attr_accessor :run_list
+        attr_accessor :file_cache_path
+        attr_accessor :file_backup_path
+        attr_accessor :verbose_logging
 
         def initialize
           super
@@ -26,6 +31,8 @@ module VagrantPlugins
           @attempts          = UNSET_VALUE
           @binary_path       = UNSET_VALUE
           @binary_env        = UNSET_VALUE
+          @custom_config_path = UNSET_VALUE
+          @formatter         = UNSET_VALUE
           @http_proxy        = UNSET_VALUE
           @http_proxy_user   = UNSET_VALUE
           @http_proxy_pass   = UNSET_VALUE
@@ -36,6 +43,9 @@ module VagrantPlugins
           @no_proxy          = UNSET_VALUE
           @node_name         = UNSET_VALUE
           @provisioning_path = UNSET_VALUE
+          @file_cache_path   = UNSET_VALUE
+          @file_backup_path  = UNSET_VALUE
+          @verbose_logging   = UNSET_VALUE
 
           @json              = {}
           @run_list          = []
@@ -46,6 +56,8 @@ module VagrantPlugins
           @attempts          = 1 if @attempts == UNSET_VALUE
           @binary_path       = nil if @binary_path == UNSET_VALUE
           @binary_env        = nil if @binary_env == UNSET_VALUE
+          @custom_config_path = nil if @custom_config_path == UNSET_VALUE
+          @formatter         = nil if @formatter == UNSET_VALUE
           @http_proxy        = nil if @http_proxy == UNSET_VALUE
           @http_proxy_user   = nil if @http_proxy_user == UNSET_VALUE
           @http_proxy_pass   = nil if @http_proxy_pass == UNSET_VALUE
@@ -56,6 +68,9 @@ module VagrantPlugins
           @no_proxy          = nil if @no_proxy == UNSET_VALUE
           @node_name         = nil if @node_name == UNSET_VALUE
           @provisioning_path = nil if @provisioning_path == UNSET_VALUE
+          @file_backup_path  = "/var/chef/backup" if @file_backup_path == UNSET_VALUE
+          @file_cache_path   = "/var/chef/cache" if @file_cache_path == UNSET_VALUE
+          @verbose_logging   = false if @verbose_logging == UNSET_VALUE
 
           # Make sure the log level is a symbol
           @log_level = @log_level.to_sym
@@ -68,6 +83,22 @@ module VagrantPlugins
           end
         end
 
+        # Just like the normal configuration "validate" method except that
+        # it returns an array of errors that should be merged into some
+        # other error accumulator.
+        def validate_base(machine)
+          errors = _detected_errors
+
+          if @custom_config_path
+            expanded = File.expand_path(@custom_config_path, machine.env.root_path)
+            if !File.file?(expanded)
+              errors << I18n.t("vagrant.config.chef.custom_config_path_missing")
+            end
+          end
+
+          errors
+        end
+
         # Adds a recipe to the run list
         def add_recipe(name)
           name = "recipe[#{name}]" unless name =~ /^recipe\[(.+?)\]$/

data/plugins/provisioners/chef/config/chef_client.rb

@@ -1,16 +1,18 @@
 require File.expand_path("../base", __FILE__)
 
+require "vagrant/util/which"
+
 module VagrantPlugins
   module Chef
     module Config
       class ChefClient < Base
         attr_accessor :chef_server_url
         attr_accessor :client_key_path
+        attr_accessor :delete_client
+        attr_accessor :delete_node
         attr_accessor :encrypted_data_bag_secret_key_path
         attr_accessor :encrypted_data_bag_secret
         attr_accessor :environment
-        attr_accessor :file_cache_path
-        attr_accessor :file_backup_path
         attr_accessor :validation_key_path
         attr_accessor :validation_client_name
 
@@ -19,11 +21,11 @@ module VagrantPlugins
 
           @chef_server_url                    = UNSET_VALUE
           @client_key_path                    = UNSET_VALUE
+          @delete_client                      = UNSET_VALUE
+          @delete_node                        = UNSET_VALUE
           @encrypted_data_bag_secret_key_path = UNSET_VALUE
           @encrypted_data_bag_secret          = UNSET_VALUE
           @environment                        = UNSET_VALUE
-          @file_cache_path                    = UNSET_VALUE
-          @file_backup_path                   = UNSET_VALUE
           @validation_key_path                = UNSET_VALUE
           @validation_client_name             = UNSET_VALUE
         end
@@ -33,22 +35,29 @@ module VagrantPlugins
 
           @chef_server_url = nil if @chef_server_url == UNSET_VALUE
           @client_key_path        = "/etc/chef/client.pem" if @client_key_path == UNSET_VALUE
+          @delete_client = false if @delete_client == UNSET_VALUE
+          @delete_node = false if @delete_node == UNSET_VALUE
           @encrypted_data_bag_secret_key_path = nil if @encrypted_data_bag_secret_key_path == UNSET_VALUE
           @encrypted_data_bag_secret          = "/tmp/encrypted_data_bag_secret" if @encrypted_data_bag_secret == UNSET_VALUE
           @environment = nil if @environment == UNSET_VALUE
-          @file_backup_path       = "/srv/chef/cache" if @file_backup_path == UNSET_VALUE
-          @file_cache_path        = "/srv/chef/file_store" if @file_cache_path == UNSET_VALUE
           @validation_client_name = "chef-validator" if @validation_client_name == UNSET_VALUE
           @validation_key_path = nil if @validation_key_path == UNSET_VALUE
         end
 
         def validate(machine)
           errors = _detected_errors
+          errors.concat(validate_base(machine))
           errors << I18n.t("vagrant.config.chef.server_url_empty") if \
             !chef_server_url || chef_server_url.strip == ""
           errors << I18n.t("vagrant.config.chef.validation_key_path") if \
             !validation_key_path
 
+          if delete_client || delete_node
+            if !Vagrant::Util::Which.which("knife")
+              errors << I18n.t("vagrant.chef_config_knife_not_found")
+            end
+          end
+
           { "chef client provisioner" => errors }
         end
       end

data/plugins/provisioners/chef/config/chef_solo.rb

@@ -11,19 +11,21 @@ module VagrantPlugins
         attr_accessor :nfs
         attr_accessor :encrypted_data_bag_secret_key_path
         attr_accessor :encrypted_data_bag_secret
+        attr_accessor :environments_path
+        attr_accessor :environment
 
         def initialize
           super
 
           @cookbooks_path            = UNSET_VALUE
           @data_bags_path            = UNSET_VALUE
+          @environments_path         = UNSET_VALUE
+          @environment               = UNSET_VALUE
           @recipe_url                = UNSET_VALUE
           @roles_path                = UNSET_VALUE
+          @nfs                       = UNSET_VALUE
           @encrypted_data_bag_secret = UNSET_VALUE
           @encrypted_data_bag_secret_key_path = UNSET_VALUE
-          @nfs                       = UNSET_VALUE
-
-          @__defaulted_cookbooks_path = false
         end
 
         #------------------------------------------------------------
@@ -34,34 +36,39 @@ module VagrantPlugins
           super
 
           @recipe_url = nil if @recipe_url == UNSET_VALUE
+          @environment = nil if @environment == UNSET_VALUE
 
           if @cookbooks_path == UNSET_VALUE
             @cookbooks_path = []
             @cookbooks_path << [:host, "cookbooks"] if !@recipe_url
             @cookbooks_path << [:vm, "cookbooks"]
-            @__defaulted_cookbooks_path = true
           end
 
-          @data_bags_path = [] if @data_bags_path == UNSET_VALUE
-          @roles_path     = [] if @roles_path == UNSET_VALUE
+          @data_bags_path    = [] if @data_bags_path == UNSET_VALUE
+          @roles_path        = [] if @roles_path == UNSET_VALUE
+          @environments_path = [] if @environments_path == UNSET_VALUE
+          @environments_path = [@environments_path].flatten
 
           # Make sure the path is an array.
-          @cookbooks_path = prepare_folders_config(@cookbooks_path)
-          @data_bags_path = prepare_folders_config(@data_bags_path)
-          @roles_path     = prepare_folders_config(@roles_path)
+          @cookbooks_path    = prepare_folders_config(@cookbooks_path)
+          @data_bags_path    = prepare_folders_config(@data_bags_path)
+          @roles_path        = prepare_folders_config(@roles_path)
+          @environments_path = prepare_folders_config(@environments_path)
 
+          @nfs = false if @nfs == UNSET_VALUE
           @encrypted_data_bag_secret = "/tmp/encrypted_data_bag_secret" if \
             @encrypted_data_bag_secret == UNSET_VALUE
           @encrypted_data_bag_secret_key_path = nil if \
             @encrypted_data_bag_secret_key_path == UNSET_VALUE
-          @nfs = false if @nfs == UNSET_VALUE
         end
 
         def validate(machine)
           errors = _detected_errors
+          errors.concat(validate_base(machine))
           errors << I18n.t("vagrant.config.chef.cookbooks_path_empty") if \
             !cookbooks_path || [cookbooks_path].flatten.empty?
-
+          errors << I18n.t("vagrant.config.chef.environment_path_required") if \
+            environment && environments_path.empty?
           { "chef solo provisioner" => errors }
         end