tnargav 1.2.3 → 1.3.3

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

@@ -42,20 +42,36 @@ module VagrantPlugins
         def chown_provisioning_folder
           @machine.communicate.tap do |comm|
             comm.sudo("mkdir -p #{@config.provisioning_path}")
-            comm.sudo("chown -R #{@machine.ssh_info[:username]} #{@config.provisioning_path}")
+            comm.sudo("chown #{@machine.ssh_info[:username]} #{@config.provisioning_path}")
           end
         end
 
         def setup_config(template, filename, template_vars)
+          # If we have custom configuration, upload it
+          remote_custom_config_path = nil
+          if @config.custom_config_path
+            expanded = File.expand_path(
+              @config.custom_config_path, @machine.env.root_path)
+            remote_custom_config_path = File.join(
+              config.provisioning_path, "custom-config.rb")
+
+            @machine.communicate.upload(expanded, remote_custom_config_path)
+          end
+
           config_file = Vagrant::Util::TemplateRenderer.render(template, {
+            :custom_configuration => remote_custom_config_path,
+            :file_cache_path => @config.file_cache_path,
+            :file_backup_path => @config.file_backup_path,
             :log_level        => @config.log_level.to_sym,
+            :verbose_logging  => @config.verbose_logging,
             :http_proxy       => @config.http_proxy,
             :http_proxy_user  => @config.http_proxy_user,
             :http_proxy_pass  => @config.http_proxy_pass,
             :https_proxy      => @config.https_proxy,
             :https_proxy_user => @config.https_proxy_user,
             :https_proxy_pass => @config.https_proxy_pass,
-            :no_proxy         => @config.no_proxy
+            :no_proxy         => @config.no_proxy,
+            :formatter        => @config.formatter
           }.merge(template_vars))
 
           # Create a temporary file to store the data so we
@@ -85,7 +101,11 @@ module VagrantPlugins
           temp.write(json)
           temp.close
 
-          @machine.communicate.upload(temp.path, File.join(@config.provisioning_path, "dna.json"))
+          remote_file = File.join(@config.provisioning_path, "dna.json")
+          @machine.communicate.tap do |comm|
+            comm.sudo("rm #{remote_file}", :error_check => false)
+            comm.upload(temp.path, remote_file)
+          end
         end
       end
     end

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

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'vagrant/util/subprocess'
 
 require File.expand_path("../base", __FILE__)
 
@@ -25,6 +26,11 @@ module VagrantPlugins
           run_chef_client
         end
 
+        def cleanup
+          delete_from_chef_server('client') if config.delete_client
+          delete_from_chef_server('node') if config.delete_node
+        end
+
         def create_client_key_folder
           @machine.env.ui.info I18n.t("vagrant.provisioners.chef.client_key_folder")
           path = Pathname.new(@config.client_key_path)
@@ -50,8 +56,6 @@ module VagrantPlugins
             :validation_client_name => @config.validation_client_name,
             :validation_key => guest_validation_key_path,
             :client_key => @config.client_key_path,
-            :file_cache_path => @config.file_cache_path,
-            :file_backup_path => @config.file_backup_path,
             :environment => @config.environment,
             :encrypted_data_bag_secret => @config.encrypted_data_bag_secret
           })
@@ -76,10 +80,8 @@ module VagrantPlugins
             exit_status = @machine.communicate.sudo(command, :error_check => false) do |type, data|
               # 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.env.ui.info(data.chomp, :color => color, :prefix => false)
+              @machine.env.ui.info(
+                data, :color => color, :new_line => false, :prefix => false)
             end
 
             # There is no need to run Chef again if it converges
@@ -101,6 +103,23 @@ module VagrantPlugins
         def guest_validation_key_path
           File.join(@config.provisioning_path, "validation.pem")
         end
+
+        def delete_from_chef_server(deletable)
+          node_name = config.node_name || env[:vm].config.vm.host_name
+          env[:ui].info(I18n.t(
+            "vagrant.provisioners.chef.deleting_from_server",
+            deletable: deletable, name: node_name))
+
+          command = ["knife", deletable, "delete", "--yes", node_name]
+          r = Vagrant::Util::Subprocess.execute(*command)
+          if r.exit_code != 0
+            env[:ui].error(I18n.t(
+              "vagrant.chef_client_cleanup_failed",
+              deletable: deletable,
+              stdout: r.stdout,
+              stderr: r.stderr))
+          end
+        end
       end
     end
   end

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

@@ -11,7 +11,7 @@ module VagrantPlugins
       class ChefSolo < Base
         extend Vagrant::Util::Counter
         include Vagrant::Util::Counter
-
+        attr_reader :environments_folders
         attr_reader :cookbook_folders
         attr_reader :role_folders
         attr_reader :data_bags_folders
@@ -25,16 +25,18 @@ module VagrantPlugins
           @cookbook_folders  = expanded_folders(@config.cookbooks_path, "cookbooks")
           @role_folders      = expanded_folders(@config.roles_path, "roles")
           @data_bags_folders = expanded_folders(@config.data_bags_path, "data_bags")
+          @environments_folders = expanded_folders(@config.environments_path, "environments")
 
           share_folders(root_config, "csc", @cookbook_folders)
           share_folders(root_config, "csr", @role_folders)
           share_folders(root_config, "csdb", @data_bags_folders)
+          share_folders(root_config, "cse", @environments_folders)
         end
 
         def provision
           # Verify that the proper shared folders exist.
           check = []
-          [@cookbook_folders, @role_folders, @data_bags_folders].each do |folders|
+          [@cookbook_folders, @role_folders, @data_bags_folders, @environments_folders].each do |folders|
             folders.each do |type, local_path, remote_path|
               # We only care about checking folders that have a local path, meaning
               # they were shared from the local machine, rather than assumed to
@@ -43,10 +45,9 @@ module VagrantPlugins
             end
           end
 
+          chown_provisioning_folder
           verify_shared_folders(check)
-
           verify_binary(chef_binary_path("chef-solo"))
-          chown_provisioning_folder
           upload_encrypted_data_bag_secret if @config.encrypted_data_bag_secret_key_path
           setup_json
           setup_solo_config
@@ -114,23 +115,27 @@ module VagrantPlugins
 
         def upload_encrypted_data_bag_secret
           @machine.env.ui.info I18n.t("vagrant.provisioners.chef.upload_encrypted_data_bag_secret_key")
-          @machine.communicate.upload(encrypted_data_bag_secret_key_path,
-                                           @config.encrypted_data_bag_secret)
+          @machine.communicate.tap do |comm|
+            comm.sudo("rm #{@config.encrypted_data_bag_secret}", :error_check => false)
+            comm.upload(encrypted_data_bag_secret_key_path,
+                        @config.encrypted_data_bag_secret)
+          end
         end
 
         def setup_solo_config
           cookbooks_path = guest_paths(@cookbook_folders)
           roles_path = guest_paths(@role_folders).first
           data_bags_path = guest_paths(@data_bags_folders).first
-
+          environments_path = guest_paths(@environments_folders).first
           setup_config("provisioners/chef_solo/solo", "solo.rb", {
             :node_name => @config.node_name,
-            :provisioning_path => @config.provisioning_path,
             :cookbooks_path => cookbooks_path,
             :recipe_url => @config.recipe_url,
             :roles_path => roles_path,
             :data_bags_path => data_bags_path,
             :encrypted_data_bag_secret => @config.encrypted_data_bag_secret,
+            :environments_path => environments_path,
+            :environment => @config.environment,
           })
         end
 
@@ -153,10 +158,8 @@ module VagrantPlugins
             exit_status = @machine.communicate.sudo(command, :error_check => false) do |type, data|
               # 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.env.ui.info(data.chomp, :color => color, :prefix => false)
+              @machine.env.ui.info(
+                data, :color => color, :new_line => false, :prefix => false)
             end
 
             # There is no need to run Chef again if it converges
@@ -170,7 +173,7 @@ module VagrantPlugins
         def verify_shared_folders(folders)
           folders.each do |folder|
             @logger.debug("Checking for shared folder: #{folder}")
-            if !@machine.communicate.test("test -d #{folder}")
+            if !@machine.communicate.test("test -d #{folder}", sudo: true)
               raise ChefError, :missing_shared_folders
             end
           end

data/plugins/provisioners/file/config.rb

@@ -0,0 +1,29 @@
+require "vagrant"
+
+module VagrantPlugins
+  module FileUpload
+    class Config < Vagrant.plugin("2", :config)
+      attr_accessor :source
+      attr_accessor :destination
+
+      def validate(machine)
+        errors = _detected_errors
+        if !source
+          errors << I18n.t("vagrant.provisioners.file.no_source_file")
+        end
+        if !destination
+          errors << I18n.t("vagrant.provisioners.file.no_dest_file")
+        end
+        if source
+          s = File.expand_path(source)
+          if ! File.exist?(s)
+            errors << I18n.t("vagrant.provisioners.file.path_invalid",
+                              :path => s)
+          end
+        end
+
+        { "File provisioner" => errors }
+      end
+    end
+  end
+end

data/plugins/provisioners/file/plugin.rb

@@ -0,0 +1,23 @@
+require "vagrant"
+
+module VagrantPlugins
+  module FileUpload
+    class Plugin < Vagrant.plugin("2")
+      name "file"
+      description <<-DESC
+      Provides support for provisioning your virtual machines with
+      uploaded files.
+      DESC
+
+      config(:file, :provisioner) do
+        require File.expand_path("../config", __FILE__)
+        Config
+      end
+
+      provisioner(:file) do
+        require File.expand_path("../provisioner", __FILE__)
+        Provisioner
+      end
+    end
+  end
+end

data/plugins/provisioners/file/provisioner.rb

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module FileUpload
+    class Provisioner < Vagrant.plugin("2", :provisioner)
+      def provision
+        @machine.communicate.tap do |comm|
+          # Make sure the remote path exists
+          command = "mkdir -p %s" % File.dirname(config.destination)
+          comm.execute(command) 
+
+          # now upload the file
+          comm.upload(File.expand_path(config.source), config.destination)
+        end
+      end
+    end
+  end
+end

data/plugins/provisioners/puppet/config/puppet.rb

@@ -10,6 +10,7 @@ module VagrantPlugins
         attr_accessor :options
         attr_accessor :temp_dir
         attr_accessor :working_directory
+        attr_accessor :nfs
 
         def initialize
           super
@@ -22,6 +23,7 @@ module VagrantPlugins
           @facter            = {}
           @temp_dir          = UNSET_VALUE
           @working_directory = UNSET_VALUE
+          @nfs               = UNSET_VALUE
         end
 
         def finalize!
@@ -33,6 +35,7 @@ module VagrantPlugins
           @module_path    = nil if @module_path == UNSET_VALUE
           @temp_dir       = "/tmp/vagrant-puppet" if @temp_dir == UNSET_VALUE
           @working_directory = nil if @working_directory == UNSET_VALUE
+          @nfs            = false if @nfs == UNSET_VALUE
         end
 
         # Returns the manifests path expanded relative to the root path of the
@@ -56,7 +59,7 @@ module VagrantPlugins
         end
 
         def validate(machine)
-          errors = []
+          errors = _detected_errors
 
           # Calculate the manifests and module paths based on env
           this_expanded_manifests_path = expanded_manifests_path(machine.env.root_path)

data/plugins/provisioners/puppet/provisioner/puppet.rb

@@ -27,17 +27,17 @@ module VagrantPlugins
             @module_paths << [path, File.join(config.temp_dir, "modules-#{i}")]
           end
 
+          folder_opts = {}
+          folder_opts[:nfs] = true if @config.nfs
+          folder_opts[:owner] = "root" if !folder_opts[:nfs]
+
           # Share the manifests directory with the guest
           root_config.vm.synced_folder(
-            @expanded_manifests_path, manifests_guest_path)
+            @expanded_manifests_path, manifests_guest_path, folder_opts)
 
           # Share the module paths
-          count = 0
           @module_paths.each do |from, to|
-            # Sorry for the cryptic key here, but VirtualBox has a strange limit on
-            # maximum size for it and its something small (around 10)
-            root_config.vm.synced_folder(from, to)
-            count += 1
+            root_config.vm.synced_folder(from, to, folder_opts)
           end
         end
 
@@ -97,6 +97,11 @@ module VagrantPlugins
             options << "--hiera_config=#{@hiera_config_path}"
           end
 
+          if !@machine.env.ui.is_a?(Vagrant::UI::Colored)
+            options << "--color=false"
+          end
+
+          options << "--manifestdir #{manifests_guest_path}"
           options << "--detailed-exitcodes"
           options << @manifest_file
           options = options.join(" ")
@@ -121,15 +126,16 @@ module VagrantPlugins
                                       :manifest => config.manifest_file)
 
           @machine.communicate.sudo(command) do |type, data|
-            data.chomp!
-            @machine.env.ui.info(data, :prefix => false) if !data.empty?
+            if !data.empty?
+              @machine.env.ui.info(data, :new_line => false, :prefix => false)
+            end
           end
         end
 
         def verify_shared_folders(folders)
           folders.each do |folder|
             @logger.debug("Checking for shared folder: #{folder}")
-            if !@machine.communicate.test("test -d #{folder}")
+            if !@machine.communicate.test("test -d #{folder}", sudo: true)
               raise PuppetError, :missing_shared_folders
             end
           end

data/plugins/provisioners/puppet/provisioner/puppet_server.rb

@@ -40,6 +40,12 @@ module VagrantPlugins
 
           # Add the certname option if there is one
           options += ["--certname", cn] if cn
+
+          # Disable colors if we must
+          if !@machine.env.ui.is_a?(Vagrant::UI::Colored)
+            options << "--color=false"
+          end
+
           options = options.join(" ")
 
           # Build up the custom facts if we have any
@@ -57,8 +63,9 @@ module VagrantPlugins
 
           @machine.env.ui.info I18n.t("vagrant.provisioners.puppet_server.running_puppetd")
           @machine.communicate.sudo(command) do |type, data|
-            data.chomp!
-            @machine.env.ui.info(data, :prefix => false) if !data.empty?
+            if !data.empty?
+              @machine.env.ui.info(data, :new_line => false, :prefix => false)
+            end
           end
         end
       end

data/plugins/provisioners/salt/bootstrap-salt.sh

@@ -0,0 +1,6 @@
+#!/bin/sh -
+
+# We just download the bootstrap script by default and execute that.
+python \
+    -c 'import urllib; print urllib.urlopen("http://bootstrap.saltstack.org").read()' \
+    | sh -s -- "$@"

data/plugins/provisioners/salt/config.rb

@@ -0,0 +1,105 @@
+require "i18n"
+require "vagrant"
+
+module VagrantPlugins
+  module Salt
+    class Config < Vagrant.plugin("2", :config)
+
+      ## salty-vagrant options
+      attr_accessor :minion_config
+      attr_accessor :minion_key
+      attr_accessor :minion_pub
+      attr_accessor :master_config
+      attr_accessor :master_key
+      attr_accessor :master_pub
+      attr_accessor :run_highstate
+      attr_accessor :always_install
+      attr_accessor :bootstrap_script
+      attr_accessor :verbose
+      attr_accessor :seed_master
+      attr_reader   :pillar_data
+
+      ## bootstrap options
+      attr_accessor :temp_config_dir
+      attr_accessor :install_type
+      attr_accessor :install_args
+      attr_accessor :install_master
+      attr_accessor :install_syndic
+      attr_accessor :no_minion
+      attr_accessor :bootstrap_options
+
+      def initialize
+        @minion_config = UNSET_VALUE
+        @minion_key = UNSET_VALUE
+        @minion_pub = UNSET_VALUE
+        @master_config = UNSET_VALUE
+        @master_key = UNSET_VALUE
+        @master_pub = UNSET_VALUE
+        @run_highstate = UNSET_VALUE
+        @always_install = UNSET_VALUE
+        @bootstrap_script = UNSET_VALUE
+        @verbose = UNSET_VALUE
+        @seed_master = UNSET_VALUE
+        @pillar_data = UNSET_VALUE
+        @temp_config_dir = UNSET_VALUE
+        @install_type = UNSET_VALUE
+        @install_args = UNSET_VALUE
+        @install_master = UNSET_VALUE
+        @install_syndic = UNSET_VALUE
+        @no_minion = UNSET_VALUE
+        @bootstrap_options = UNSET_VALUE
+      end
+
+      def finalize!
+        @minion_config      = nil if @minion_config == UNSET_VALUE
+        @minion_key         = nil if @minion_key == UNSET_VALUE
+        @minion_pub         = nil if @minion_pub == UNSET_VALUE
+        @master_config      = nil if @master_config == UNSET_VALUE
+        @master_key         = nil if @master_key == UNSET_VALUE
+        @master_pub         = nil if @master_pub == UNSET_VALUE
+        @run_highstate      = nil if @run_highstate == UNSET_VALUE
+        @always_install     = nil if @always_install == UNSET_VALUE
+        @bootstrap_script   = nil if @bootstrap_script == UNSET_VALUE
+        @verbose            = nil if @verbose == UNSET_VALUE
+        @seed_master        = nil if @seed_master == UNSET_VALUE
+        @pillar_data        = {}  if @pillar_data == UNSET_VALUE
+        @temp_config_dir    = nil if @temp_config_dir == UNSET_VALUE
+        @install_type       = nil if @install_type == UNSET_VALUE
+        @install_args       = nil if @install_args == UNSET_VALUE
+        @install_master     = nil if @install_master == UNSET_VALUE
+        @install_syndic     = nil if @install_syndic == UNSET_VALUE
+        @no_minion          = nil if @no_minion == UNSET_VALUE
+        @bootstrap_options  = nil if @bootstrap_options == UNSET_VALUE
+
+      end
+
+      def pillar(data)
+        @pillar_data = {} if @pillar_data == UNSET_VALUE
+        @pillar_data.deep_merge!(data)
+      end
+
+      def validate(machine)
+        errors = _detected_errors
+        if @minion_key || @minion_pub
+          if !@minion_key || !@minion_pub
+            errors << @minion_pub
+          end
+        end
+
+        if @master_key && @master_pub
+          if !@minion_key && !@minion_pub
+            errors << I18n.t("salt.missing_key")
+          end
+        end
+
+        if @install_master && !@no_minion && !@seed_master && @run_highstate
+          errors << I18n.t("salt.must_accept_keys")
+        end
+
+        return {"salt" => errors}
+      end
+
+
+    end
+  end
+end