vagrant-salt 0.1.4 → 0.2.0

data/README.rst

@@ -21,7 +21,7 @@ to deploy for other environments.
 
 There are two different ways to use `Salty Vagrant`_. The simplest way uses 
 the salt minion in a masterless configuration. With this option you distribute 
-your state tree along with your Vagrantfile and a dev minion config. The 
+your state tree along with your Vagrantfile and a minion config. The 
 minion will bootstrap itself and apply all necessary states.
 
 The second method lets you specify a remote salt master, which assures that 
@@ -36,12 +36,12 @@ Masterless (Quick Start)
 1. Install `Vagrant`_
 2. Install `Salty Vagrant`_ (``vagrant gem install vagrant-salt``)
 3. Get the Ubuntu 12.04 base box: ``vagrant box add precise64 http://files.vagrantup.com/precise64.box``
-4. Create/Update your ``Vagrantfile`` (Detailed in `Configuration`_)
-5. Place your salt state tree in ``salt/roots/salt``
-6. Place your minion config in ``salt/minion`` [#file_client]_
-7. Run ``vagrant up`` and you should be good to go.
+4. Create/Update your ``Vagrantfile`` (Detailed in `Configuration`_) [#shared_folders]_
+5. Place your minion config in ``salt/minion`` [#file_client]_
+6. Run ``vagrant up`` and you should be good to go.
 
 .. [#file_client] Make sure your minion config sets ``file_client: local`` for masterless
+.. [#shared_folders] Don't forget to create a shared folder for your salt file root
 
 Using Remote Salt Master
 ========================
@@ -62,7 +62,7 @@ On the master, create the keypair and add the public key to the accepted minions
 folder::
 
     root@saltmaster# salt-key --gen-keys=[minion_id]
-    root@saltmaster# cp minion_id.pub /etc/salt/pki/minions/[minion_id]
+    root@saltmaster# cp [minion_id].pub /etc/salt/pki/minions/[minion_id]
 
 Replace ``[minion_id]`` with the id you would like to assign the minion. 
 
@@ -102,24 +102,27 @@ Configuration
 Your ``Vagrantfile`` should look roughly like this::
 
     Vagrant::Config.run do |config|
+      ## Chose your base box
       config.vm.box = "precise64"
+
+      ## For masterless, mount your salt file root
+      config.vm.share_folder "salt_file_root", "/srv", "/path/to/salt_file_root"
+
+
       ## Use all the defaults:
       config.vm.provision :salt do |salt|
         salt.run_highstate = true
 
         ## Optional Settings:
         # salt.minion_config = "salt/minion.conf"
-
-        ## Only Use these with a masterless setup to
-        ## load your state tree:
-        # salt.salt_file_root_path = "salt/roots/salt"
-        # salt.salt_pillar_root_path = "salt/roots/pillar"
+        # salt.temp_config_dir = "/existing/folder/on/basebox/"
+        # salt.salt_install_type = "git"
+        # salt.salt_install_args = "develop"
 
         ## If you have a remote master setup, you can add
         ## your preseeded minion key
-        # salt.master = true
-        # salt.minion_key = "salt/key/testing.pem"
-        # salt.minion_pub = "salt/key/testing.pub"
+        # salt.minion_key = "salt/key/minion.pem"
+        # salt.minion_pub = "salt/key/minion.pub"
       end
     end
 
@@ -129,58 +132,98 @@ depending on whether you are running masterless or with a remote master.
 minion_config : "salt/minion.conf"
     Path to your minion configuration file.
 
+temp_config_dir : "/tmp"
+    Path on the guest box that the minion files will be copied to before
+    placing in the salt directories. (Not all distros support "/tmp")
+
 minion_key : false
     String path to your minion key. Only useful with ``master=true``
 
 minion_pub : false
     String path to your minion public key. Only useful with ``master=true``
 
-master : false
-    Boolean whether or not you want to use a remote master. If set to false,
-    make sure your minion config file has ``file_client: local`` set.
-
-salt_file_root_path : "salt/roots/salt"
-    String path to your salt state tree. Only useful with ``master=false``.
+salt_install_type : "stable" : "daily" : "git"
+    Whether to install from a distribution's stable package manager, a
+    daily ppa, or git treeish.
 
-salt_file_root_guest_path : "/srv/salt"
-    Path to share the file root state tree on the VM. Only use with ``master=false``.
+salt_install_args : ""
+    When performing a git install, you can specify a branch, tag, or 
+    any treeish.
 
-salt_pillar_root_path : "salt/roots/pillar"
-    Path to share your pillar tree. Only useful with ``master=false``.
-
-salt_pillar_root_guest_path : "/srv/pillar"
-    Path on VM where pillar tree will be shared. Only use with ``master=true``
 
 Bootstrapping Salt
 ==================
 
-Before `Salt`_ can be used for provisioning on the target virtual box, the binaries need to be installed. Since `Vagrant`_ and `Salt`_ support many different distributions and versions of operating systems, the `Salt`_ installation process is handled by the shell script ``scripts/bootstrap-salt-minion.sh``. This script runs through a series of checks to determine operating system type and version to then install the `Salt`_ binaries using the appropriate methods.
+Before `Salt`_ can be used for provisioning on the target virtual box, the 
+binaries need to be installed. Since `Vagrant`_ and `Salt`_ support many 
+different distributions and versions of operating systems, the `Salt`_ 
+installation process is handled by the shell script 
+``scripts/bootstrap-salt-minion.sh``. This script runs through a series of 
+checks to determine operating system type and version to then install the 
+`Salt`_ binaries using the appropriate methods.
 
 Adding support for other operating systems
 ------------------------------------------
-
-Below is an example for targeting an installation for Debian Squeeze which first checks for the ``/etc/debian_version`` file and then determines the version using ``cat /etc/debian_version``::
-
-    (...)
-    elif [ -f /etc/debian_version ] ; then
-        DVER=$(cat /etc/debian_version)
-        if [ $DVER = '6.0'  ]; then
-            log "Installing for Debian Squeeze."
-            do_with_root echo "deb http://backports.debian.org/debian-backports squeeze-backports main" >> /etc/apt/sources.list.d/backports.list
-            do_with_root apt-get update
-            do_with_root apt-get -t squeeze-backports -y install salt-minion
-        else
-            log "Debian version $VER not supported."
-            exit 1
-        fi
-    (...)
-
-The bootstrapping script must be plain POSIX sh only, **not** bash or another shell script. By design the targeting for each operating system and version is very specific. Assumptions of supported versions or variants should not be made, to avoid failed or broken installations.
+In order to install salt for a distribution you need to define:
+
+   To Install Dependencies, which is required, one of:
+       1. install_<distro>_<distro_version>_<install_type>_deps
+       2. install_<distro>_<distro_version>_deps
+       3. install_<distro>_<install_type>_deps
+       4. install_<distro>_deps
+
+
+   To install salt, which, of course, is required, one of:
+       1. install_<distro>_<distro_version>_<install_type>
+       2. install_<distro>_<install_type>
+
+   Optionally, define a minion configuration function, which will be called if
+   the -c|config-dir option is passed. One of:
+       1. config_<distro>_<distro_version>_<install_type>_minion
+       2. config_<distro>_<distro_version>_minion
+       3. config_<distro>_<install_type>_minion
+       4. config_<distro>_minion
+       5. config_minion [THIS ONE IS ALREADY DEFINED AS THE DEFAULT]
+
+   Also optionally, define a post install function, one of:
+       1. install_<distro>_<distro_versions>_<install_type>_post
+       2. install_<distro>_<distro_versions>_post
+       3. install_<distro>_<install_type>_post
+       4. install_<distro>_post
+
+Below is an example for Ubuntu Oneiric:
+
+    install_ubuntu_1110_deps() {
+        apt-get update
+        apt-get -y install python-software-properties
+        add-apt-repository -y 'deb http://us.archive.ubuntu.com/ubuntu/ oneiric universe'
+        add-apt-repository -y ppa:saltstack/salt
+    }
+
+    install_ubuntu_1110_post() {
+        add-apt-repository -y --remove 'deb http://us.archive.ubuntu.com/ubuntu/ oneiric universe'
+    }
+
+    install_ubuntu_stable() {
+        apt-get -y install salt-minion
+    }
+
+Since there is no ``install_ubuntu_1110_stable()`` it defaults to the 
+unspecified version script.
+
+The bootstrapping script must be plain POSIX sh only, **not** bash or another 
+shell script. By design the targeting for each operating system and version is 
+very specific. Assumptions of supported versions or variants should not be 
+made, to avoid failed or broken installations.
 
 Supported Operating Systems
 ---------------------------
 - Ubuntu 10.x/11.x/12.x
 - Debian 6.x
+- CentOS 6.3
+- Fedora
+- Arch
+- FreeBSD 9.0
 
 Installation Notes
 ==================
@@ -204,3 +247,5 @@ Installing from source
 3. ``cd saltstack-salty-vagrant-[hash]``
 4. ``gem build vagrant-salt.gemspec``
 5. ``vagrant gem install vagrant-salt-[version].gem``
+
+.. vim: fenc=utf-8 spell spl=en cc=80 tw=79 fo=want sts=2 sw=2 et

data/example/Vagrantfile

@@ -1,25 +1,26 @@
-require "../lib/vagrant-salt"
+# require "../lib/vagrant-salt"
 
 Vagrant::Config.run do |config|
+  ## Chose your base box
   config.vm.box = "precise64"
+
+  ## For masterless, mount your salt file root
+  config.vm.share_folder "salt_file_root", "/srv", "salt/roots/"
+
+
   ## Use all the defaults:
   config.vm.provision :salt do |salt|
-    salt.run_highstate = true
-
+    salt.run_highstate = false
 
     ## Optional Settings:
     # salt.minion_config = "salt/minion.conf"
-    # salt.salt_install_type = "daily"
-
-  	## Only Use these with a masterless setup to
-  	## load your state tree:
-  	# salt.salt_file_root_path = "salt/roots/salt"
-  	# salt.salt_pillar_root_path = "salt/roots/pillar"
+    # salt.temp_config_dir = "/existing/folder/on/basebox/"
+    # salt.salt_install_type = "git"
+    # salt.salt_install_args = "develop"
 
-  	## If you have a remote master setup, you can add
-  	## your preseeded minion key
-    # salt.master = true
-    # salt.minion_key = "salt/key/testing.pem"
-    # salt.minion_pub = "salt/key/testing.pub"
+    ## If you have a remote master setup, you can add
+    ## your preseeded minion key
+    # salt.minion_key = "salt/key/minion.pem"
+    # salt.minion_pub = "salt/key/minion.pub"
   end
 end

data/lib/vagrant-salt/provisioner.rb

@@ -2,26 +2,18 @@ module VagrantSalt
   class Provisioner < Vagrant::Provisioners::Base
     class Config < Vagrant::Config::Base
       attr_accessor :minion_config
+      attr_accessor :temp_config_dir
       attr_accessor :minion_key
       attr_accessor :minion_pub
-      attr_accessor :master
       attr_accessor :run_highstate
-      attr_accessor :salt_file_root_path
-      attr_accessor :salt_file_root_guest_path
-      attr_accessor :salt_pillar_root_path
-      attr_accessor :salt_pillar_root_guest_path
       attr_accessor :salt_install_type
       attr_accessor :salt_install_args
 
       def minion_config; @minion_config || "salt/minion.conf"; end
+      def temp_config_dir; @temp_config_dir || "/tmp/"; end
       def minion_key; @minion_key || false; end
       def minion_pub; @minion_pub || false; end
-      def master; @master || false; end
       def run_highstate; @run_highstate || false; end
-      def salt_file_root_path; @salt_file_root_path || "salt/roots/salt"; end
-      def salt_file_root_guest_path; @salt_file_root_guest_path || "/srv/salt"; end
-      def salt_pillar_root_path; @salt_pillar_root_path || "salt/roots/pillar"; end
-      def salt_pillar_root_guest_path; @salt_pillar_root_guest_path || "/srv/pillar"; end
       def salt_install_type; @salt_install_type || ''; end
       def salt_install_args; @salt_install_args || ''; end
 
@@ -31,7 +23,12 @@ module VagrantSalt
       end
 
       def bootstrap_options
-        '%s %s' % [salt_install_type, salt_install_args]
+        options = ''
+        if temp_config_dir
+          options = options + '-c %s' % temp_config_dir
+        end
+        options = options + ' %s %s' % [salt_install_type, salt_install_args]
+        return options
       end
     end
 
@@ -42,15 +39,6 @@ module VagrantSalt
     def prepare
       # Calculate the paths we're going to use based on the environment
       @expanded_minion_config_path = config.expanded_path(env[:root_path], config.minion_config)
-      if !config.master
-        env[:ui].info "Adding state tree folders."
-        @expanded_salt_file_root_path = config.expanded_path(env[:root_path], config.salt_file_root_path)
-        @expanded_salt_pillar_root_path = config.expanded_path(env[:root_path], config.salt_pillar_root_path)
-        check_salt_file_root_path
-        check_salt_pillar_root_path
-        share_salt_file_root_path
-        share_salt_pillar_root_path
-      end
 
       if config.minion_key
         @expanded_minion_key_path = config.expanded_path(env[:root_path], config.minion_key)
@@ -58,28 +46,6 @@ module VagrantSalt
       end
     end
 
-    def check_salt_file_root_path
-      if !File.directory?(@expanded_salt_file_root_path)
-        raise "Salt file root path does not exist: #{@expanded_salt_file_root_path}"
-      end
-    end
-
-    def check_salt_pillar_root_path
-      if !File.directory?(@expanded_salt_pillar_root_path)
-        raise "Salt pillar root path does not exist: #{@expanded_salt_pillar_root_path}"
-      end
-    end
-
-    def share_salt_file_root_path
-      env[:ui].info "Sharing file root folder."
-      env[:vm].config.vm.share_folder("salt_file_root", config.salt_file_root_guest_path, @expanded_salt_file_root_path)
-    end
-
-    def share_salt_pillar_root_path
-      env[:ui].info "Sharing pillar root path."
-      env[:vm].config.vm.share_folder("salt_pillar_root", config.salt_pillar_root_guest_path, @expanded_salt_pillar_root_path)
-    end
-
     def salt_exists
       env[:ui].info "Checking for salt binaries..."
       if env[:vm].channel.test("which salt-call") and
@@ -97,8 +63,9 @@ module VagrantSalt
       env[:vm].channel.sudo("chmod +x /tmp/bootstrap-salt-minion.sh")
       bootstrap = env[:vm].channel.sudo("/tmp/bootstrap-salt-minion.sh %s" % config.bootstrap_options) do |type, data|
         if data[0] == "\n"
-            # Remove any leading newline but not whitespace, for that one would use data.lstrip
-            data = data[1..-1]
+          # Remove any leading newline but not whitespace. If we wanted to
+          # remove newlines and whitespace we would have used data.lstrip
+          data = data[1..-1]
         end
         env[:ui].info(data.rstrip)
       end
@@ -127,34 +94,27 @@ module VagrantSalt
 
     def upload_minion_config
       env[:ui].info "Copying salt minion config to vm."
-      env[:vm].channel.upload(@expanded_minion_config_path.to_s, "/tmp/minion")
-      env[:vm].channel.sudo("mv /tmp/minion /etc/salt/minion")
+      env[:vm].channel.upload(@expanded_minion_config_path.to_s, config.temp_config_dir + "minion")
     end
 
     def upload_minion_keys
       env[:ui].info "Uploading minion key."
-      env[:vm].channel.upload(@expanded_minion_key_path.to_s, "/tmp/minion.pem")
-      env[:vm].channel.sudo("mv /tmp/minion.pem /etc/salt/pki/minion.pem")
-      env[:vm].channel.upload(@expanded_minion_pub_path.to_s, "/tmp/minion.pub")
-      env[:vm].channel.sudo("mv /tmp/minion.pub /etc/salt/pki/minion.pub")
+      env[:vm].channel.upload(@expanded_minion_key_path.to_s, config.temp_config_dir + "minion.pem")
+      env[:vm].channel.upload(@expanded_minion_pub_path.to_s, config.temp_config_dir + "minion.pub")
     end
 
     def provision!
 
-      if !config.master
-        verify_shared_folders([config.salt_file_root_guest_path, config.salt_pillar_root_guest_path])
-      end
-
-      if !salt_exists
-        bootstrap_salt_minion
-      end
-
       upload_minion_config
 
       if config.minion_key
         upload_minion_keys
       end
 
+      if !salt_exists
+        bootstrap_salt_minion
+      end
+
       call_highstate
     end
 
@@ -168,4 +128,7 @@ module VagrantSalt
       end
     end
   end
+
 end
+
+# vim: fenc=utf-8 spell spl=en cc=80 sts=2 sw=2 et

data/scripts/bootstrap-salt-minion.sh

@@ -9,7 +9,7 @@
 #
 #          BUGS: https://github.com/saltstack/salty-vagrant/issues
 #        AUTHOR: Pedro Algarvio (s0undt3ch), pedro@algarvio.me
-#                Alec Koumjian (akoumjian)
+#                Alec Koumjian (akoumjian), akoumjian@gmail.com
 #  ORGANIZATION: Salt Stack (saltstack.org)
 #       CREATED: 10/15/2012 09:49:37 PM WEST
 #===============================================================================
@@ -45,20 +45,23 @@ usage() {
   Options:
   -h|help       Display this message
   -v|version    Display script version
+  -c|config-dir Temporary minion configuration directory
 EOT
 }   # ----------  end of function usage  ----------
 
 #-----------------------------------------------------------------------
 #  Handle command line arguments
 #-----------------------------------------------------------------------
+TEMP_CONFIG_DIR="null"
 
-while getopts ":hv" opt
+while getopts ":hvc:" opt
 do
   case $opt in
 
-    h|help     )  usage; exit 0   ;;
+    h|help          )  usage; exit 0   ;;
 
-    v|version  )  echo "$0 -- Version $ScriptVersion"; exit 0   ;;
+    v|version       )  echo "$0 -- Version $ScriptVersion"; exit 0   ;;
+    c|config-dir    )  TEMP_CONFIG_DIR="$OPTARG" ;;
 
     \? )  echo "\n  Option does not exist : $OPTARG\n"
           usage; exit 1   ;;
@@ -84,7 +87,7 @@ if [ $ITYPE = "git" ]; then
     if [ "$#" -eq 0 ];then
         GIT_REV="master"
     else
-        GIT_REV=$1
+        GIT_REV="$1"
         shift
     fi
 fi
@@ -103,15 +106,54 @@ if [ $(whoami) != "root" ] ; then
 fi
 
 
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  __exit_cleanup
+#   DESCRIPTION:  Cleanup any leftovers after script has ended
+#-------------------------------------------------------------------------------
+__exit_cleanup() {
+    EXIT_CODE=$?
+
+    # Remove the logging pipe when the script exits
+    echo " * Removing the logging pipe $LOGPIPE"
+    rm -f $LOGPIPE
+
+    # Kill tee when exiting, CentOS, at least requires this
+    TEE_PID=$(ps ax | grep tee | grep $LOGFILE | awk '{print $1}')
+
+    [ "x$TEE_PID" = "x" ] && exit $EXIT_CODE
+
+    echo " * Killing logging pipe tee's with pid(s): $TEE_PID"
+
+    # We need to trap errors since killing tee will cause a 127 errno
+    # We also do this as late as possible so we don't "mis-catch" other errors
+    __trap_errors() {
+        echo "Errors Trapped: $EXIT_CODE"
+        # Exit with the "original" exit code, not the trapped code
+        exit $EXIT_CODE
+    }
+    # Bash understands ERR trap signal, FreeBSD does not
+    trap "__trap_errors" ERR >/dev/null 2>&1 || trap "__trap_errors" INT KILL QUIT
+
+    # Now we're "good" to kill tee
+    kill -TERM $TEE_PID
+
+    # In case the 127 errno is not triggered, exit with the "original" exit code
+    exit $EXIT_CODE
+}
+trap "__exit_cleanup" EXIT
+
+
 # Define our logging file and pipe paths
 LOGFILE="/tmp/$(basename $0 | sed s/.sh/.log/g )"
 LOGPIPE="/tmp/$(basename $0 | sed s/.sh/.logpipe/g )"
 
-# Remove the logging pipe when the script exits
-trap "rm -f $LOGPIPE" EXIT
-
 # Create our logging pipe
-mknod $LOGPIPE p
+# On FreeBSD we have to use mkfifo instead of mknod
+mknod $LOGPIPE p >/dev/null 2>&1 || mkfifo $LOGPIPE >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+    echo " * Failed to create the named pipe required to log"
+    exit 1
+fi
 
 # What ever is written to the logpipe gets written to the logfile
 tee < $LOGPIPE $LOGFILE &
@@ -124,6 +166,24 @@ exec 2>&-
 exec 2>$LOGPIPE
 
 
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  __gather_hardware_info
+#   DESCRIPTION:  Discover hardware information
+#-------------------------------------------------------------------------------
+__gather_hardware_info() {
+    if [ -f /proc/cpuinfo ]; then
+        CPU_VENDOR_ID=$( cat /proc/cpuinfo | grep vendor_id | head -n 1 | awk '{print $3}' )
+    else
+        CPU_VENDOR_ID=$( sysctl -n hw.model )
+    fi
+    CPU_VENDOR_ID_L=$( echo $CPU_VENDOR_ID | tr '[:upper:]' '[:lower:]' )
+    CPU_ARCH=$(uname -m 2>/dev/null || uname -p 2>/dev/null || echo "unknown")
+    CPU_ARCH_L=$( echo $CPU_ARCH | tr '[:upper:]' '[:lower:]' )
+
+}
+__gather_hardware_info
+
+
 #---  FUNCTION  ----------------------------------------------------------------
 #          NAME:  __gather_os_info
 #   DESCRIPTION:  Discover operating system information
@@ -133,11 +193,29 @@ __gather_os_info() {
     OS_NAME_L=$( echo $OS_NAME | tr '[:upper:]' '[:lower:]' )
     OS_VERSION=$(uname -r)
     OS_VERSION_L=$( echo $OS_VERSION | tr '[:upper:]' '[:lower:]' )
-    MACHINE=$(uname -m 2>/dev/null || uname -p 2>/dev/null || echo "unknown")
 }
 __gather_os_info
 
 
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  __parse_version_string
+#   DESCRIPTION:  Parse version strings ignoring the revision.
+#                 MAJOR.MINOR.REVISION becomes MAJOR.MINOR
+#-------------------------------------------------------------------------------
+__parse_version_string() {
+    VERSION_STRING="$1"
+    PARSED_VERSION=$(
+        echo $VERSION_STRING |
+        sed -e 's/^/#/' \
+            -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\)\(\.[0-9][0-9]*\).*$/\1/' \
+            -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
+            -e 's/^#[^0-9]*\([0-9][0-9]*\).*$/\1/' \
+            -e 's/^#.*$//'
+    )
+    echo $PARSED_VERSION
+}
+
+
 #---  FUNCTION  ----------------------------------------------------------------
 #          NAME:  __gather_linux_system_info
 #   DESCRIPTION:  Discover Linux system information
@@ -148,7 +226,7 @@ __gather_linux_system_info() {
 
     if [ -f /etc/lsb-release ]; then
         DISTRO_NAME=$(grep DISTRIB_ID /etc/lsb-release | sed -e 's/.*=//')
-        DISTRO_VERSION=$(grep DISTRIB_RELEASE /etc/lsb-release | sed -e 's/.*=//')
+        DISTRO_VERSION=$(__parse_version_string $(grep DISTRIB_RELEASE /etc/lsb-release | sed -e 's/.*=//'))
     fi
 
     if [ "x$DISTRO_NAME" != "x" -a "x$DISTRO_VERSION" != "x" ]; then
@@ -162,17 +240,11 @@ __gather_linux_system_info() {
             echo redhat-release lsb-release
             ); do
 
-        [ ! -f "/etc/${rsource}" ] && continue
+        [ -L "/etc/${rsource}" ] && continue        # Don't follow symlinks
+        [ ! -f "/etc/${rsource}" ] && continue      # Does not exist
 
         n=$(echo ${rsource} | sed -e 's/[_-]release$//' -e 's/[_-]version$//')
-        v=$(
-            (grep VERSION /etc/${rsource}; cat /etc/${rsource}) | grep '[0-9]' | sed -e 'q' |\
-            sed -e 's/^/#/' \
-                -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\)\(\.[0-9][0-9]*\).*$/\1[\2]/' \
-                -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
-                -e 's/^#[^0-9]*\([0-9][0-9]*\).*$/\1/' \
-                -e 's/^#.*$//'
-        )
+        v=$( __parse_version_string "$( (grep VERSION /etc/${rsource}; cat /etc/${rsource}) | grep '[0-9]' | sed -e 'q' )" )
         case $(echo ${n} | tr '[:upper:]' '[:lower:]') in
             redhat )
                 if [ ".$(egrep '(Red Hat Enterprise Linux|CentOS)' /etc/${rsource})" != . ]; then
@@ -222,7 +294,7 @@ __gather_sunos_system_info() {
 #-------------------------------------------------------------------------------
 __gather_bsd_system_info() {
     DISTRO_NAME=${OS_NAME}
-    DISTRO_VERSION=$(echo "${OS_VERSION}" | sed -e 's;[()];;' -e 's/\(-.*\)$/[\1]/')
+    DISTRO_VERSION=$(echo "${OS_VERSION}" | sed -e 's;[()];;' -e 's/-.*$//')
 }
 
 
@@ -258,25 +330,25 @@ __gather_system_info() {
 #-------------------------------------------------------------------------------
 __function_defined() {
     FUNC_NAME=$1
-    if [ ${DISTRO_NAME} = "centos" ]; then
+    if [ "${DISTRO_NAME}" = "centos" ]; then
         if typeset -f $FUNC_NAME &>/dev/null ; then
             echo " * INFO: Found function $FUNC_NAME"
             return 0
         fi
-    elif [ ${DISTRO_NAME} = "ubuntu" ]; then
+    elif [ "${DISTRO_NAME}" = "ubuntu" ]; then
         if $( type ${FUNC_NAME} | grep -q 'shell function' ); then
             echo " * INFO: Found function $FUNC_NAME"
             return 0
         fi
     # Last resorts try POSIXLY_CORRECT or not
     elif test -n "${POSIXLY_CORRECT+yes}"; then
-        if typeset -f $FUNC_NAME &>/dev/null ; then
+        if typeset -f $FUNC_NAME >/dev/null 2>&1 ; then
             echo " * INFO: Found function $FUNC_NAME"
             return 0
         fi
     else
         # Arch linux seems to fall here
-        if $( type ${FUNC_NAME}  &>/dev/null ) ; then
+        if $( type ${FUNC_NAME}  >/dev/null 2>&1 ) ; then
             echo " * INFO: Found function $FUNC_NAME"
             return 0
         fi
@@ -286,10 +358,27 @@ __function_defined() {
 }
 __gather_system_info
 
+
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  __git_clone_and_checkout
+#   DESCRIPTION:  (DRY) Helper function to clone and checkout salt to a
+#                 specific revision.
+#-------------------------------------------------------------------------------
+__git_clone_and_checkout() {
+    SALT_GIT_CHECKOUT_DIR=/tmp/git/salt
+    [ -d /tmp/git ] || mkdir /tmp/git
+    cd /tmp/git
+    [ -d $SALT_GIT_CHECKOUT_DIR ] || git clone git://github.com/saltstack/salt.git salt
+    cd salt
+    git checkout $GIT_REV
+}
+
+
 echo " * System Information:"
+echo "     CPU:          ${CPU_VENDOR_ID}"
+echo "     CPU Arch:     ${CPU_ARCH}"
 echo "     OS Name:      ${OS_NAME}"
 echo "     OS Version:   ${OS_VERSION}"
-echo "     Machine:      ${MACHINE}"
 echo "     Distribution: ${DISTRO_NAME} ${DISTRO_VERSION}"
 
 
@@ -300,7 +389,16 @@ else
     DISTRO_VERSION_NO_DOTS="_$(echo $DISTRO_VERSION | tr -d '.')"
 fi
 # Simplify distro name naming on functions
-DISTRO_NAME_L=$(echo $DISTRO_NAME | tr '[:upper:]' '[:lower:]')
+DISTRO_NAME_L=$(echo $DISTRO_NAME | tr '[:upper:]' '[:lower:]' | sed 's/[^a-zA-Z0-9_ ]//g' | sed -e 's|[:space:]+|_|g')
+
+#---  FUNCTION  ----------------------------------------------------------------
+#          NAME:  __apt_get_noinput
+#   DESCRIPTION:  (DRY) apt-get install with noinput options
+#-------------------------------------------------------------------------------
+__apt_get_noinput() {
+    apt-get install -y -o DPkg::Options::=--force-confold $@
+}
+
 
 ##############################################################################
 #
@@ -317,10 +415,17 @@ DISTRO_NAME_L=$(echo $DISTRO_NAME | tr '[:upper:]' '[:lower:]')
 #
 #   To install salt, which, of course, is required, one of:
 #       1. install_<distro>_<distro_version>_<install_type>
-#       1. install_<distro>_<install_type>
+#       2. install_<distro>_<install_type>
 #
+#   Optionally, define a minion configuration function, which will be called if
+#   the -c|config-dir option is passed. One of:
+#       1. config_<distro>_<distro_version>_<install_type>_minion
+#       2. config_<distro>_<distro_version>_minion
+#       3. config_<distro>_<install_type>_minion
+#       4. config_<distro>_minion
+#       5. config_minion [THIS ONE IS ALREADY DEFINED AS THE DEFAULT]
 #
-#   And optionally, define a post install function, one of:
+#   Also optionally, define a post install function, one of:
 #       1. install_<distro>_<distro_versions>_<install_type>_post
 #       2. install_<distro>_<distro_versions>_post
 #       3. install_<distro>_<install_type>_post
@@ -332,46 +437,82 @@ DISTRO_NAME_L=$(echo $DISTRO_NAME | tr '[:upper:]' '[:lower:]')
 #
 #   Ubuntu Install Functions
 #
-##############################################################################
 install_ubuntu_deps() {
     apt-get update
-    apt-get -y install python-software-properties
+    __apt_get_noinput python-software-properties
     add-apt-repository -y ppa:saltstack/salt
     apt-get update
 }
 
 install_ubuntu_1004_deps() {
     apt-get update
-    apt-get -y install python-software-properties
+    __apt_get_noinput python-software-properties
     add-apt-repository ppa:saltstack/salt
     apt-get update
-    apt-get -y install salt-minion
+    __apt_get_noinput salt-minion
+}
+
+install_ubuntu_1004_git_deps() {
+    install_ubuntu_1004_deps
+    __apt_get_noinput git-core
 }
 
 install_ubuntu_1110_deps() {
     apt-get update
-    apt-get -y install python-software-properties
+    __apt_get_noinput python-software-properties
     add-apt-repository -y 'deb http://us.archive.ubuntu.com/ubuntu/ oneiric universe'
     add-apt-repository -y ppa:saltstack/salt
 }
 
 install_ubuntu_daily_deps() {
     apt-get update
-    apt-get -y install python-software-properties
+    __apt_get_noinput python-software-properties
     add-apt-repository -y ppa:saltstack/salt-daily
     apt-get update
 }
 
+install_ubuntu_git_deps() {
+    apt-get update
+    __apt_get_noinput python-software-properties
+    add-apt-repository  ppa:saltstack/salt
+    apt-get update
+    __apt_get_noinput git-core python-yaml python-m2crypto python-crypto msgpack-python python-zmq python-jinja2
+}
+
 install_ubuntu_1110_post() {
     add-apt-repository -y --remove 'deb http://us.archive.ubuntu.com/ubuntu/ oneiric universe'
 }
 
 install_ubuntu_stable() {
-    apt-get -y install salt-minion
+    __apt_get_noinput salt-minion
 }
 
 install_ubuntu_daily() {
-    apt-get -y install salt-minion
+    __apt_get_noinput salt-minion
+}
+
+install_ubuntu_git() {
+    __git_clone_and_checkout
+    python setup.py install --install-layout=deb
+}
+
+install_ubuntu_git_post() {
+    for fname in $(echo "minion master syndic"); do
+        if [ $fname != "minion" ]; then
+            # Guess we should only enable and start the minion service. Right??
+            continue
+        fi
+        if [ -f ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.init ]; then
+            cp ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.init /etc/init.d/salt-$fname
+        fi
+        if [ -f ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.upstart ]; then
+            cp ${SALT_GIT_CHECKOUT_DIR}/debian/salt-$fname.upstart /etc/init/salt-$fname.conf
+        elif [ -f ${SALT_GIT_CHECKOUT_DIR}/pkg/salt-$fname.upstart ]; then
+            cp ${SALT_GIT_CHECKOUT_DIR}/pkg/salt-$fname.upstart /etc/init/salt-$fname.conf
+        fi
+        chmod +x /etc/init.d/salt-$fname
+        service salt-$fname start
+    done
 }
 #
 #   End of Ubuntu Install Functions
@@ -382,6 +523,15 @@ install_ubuntu_daily() {
 #
 #   Debian Install Functions
 #
+
+install_debian_deps() {
+    apt-get update
+}
+
+install_debian_stable() {
+    __apt_get_noinput salt-minion
+}
+
 install_debian_60_stable_deps() {
     echo "deb http://backports.debian.org/debian-backports squeeze-backports main" >> \
         /etc/apt/sources.list.d/backports.list
@@ -389,19 +539,90 @@ install_debian_60_stable_deps() {
 }
 
 install_debian_60_stable() {
-    apt-get -t squeeze-backports -y install salt-minion
+    __apt_get_noinput -t squeeze-backports salt-minion
+}
+
+install_debian_60_git_deps() {
+    install_debian_60_stable_deps
+    install_debian_60_stable
+}
+
+install_debian_60_git() {
+    __apt_get_noinput git
+    apt-get -y purge salt-minion
+
+    __git_clone_and_checkout
+
+    python setup.py install --install-layout=deb
+    mkdir -p /etc/salt
+    cp conf/minion.template /etc/salt/minion
 }
 #
 #   Ended Debian Install Functions
 #
 ##############################################################################
 
+##############################################################################
+#
+#   Fedora Install Functions
+#
+install_fedora_deps() {
+    yum install -y PyYAML libyaml m2crypto python-crypto python-jinja2 python-msgpack python-zmq
+}
+
+install_fedora_stable() {
+    yum install -y salt-minion
+}
+
+
+install_fedora_git_deps() {
+    install_fedora_deps
+    yum install -y git
+}
+
+install_fedora_git() {
+    __git_clone_and_checkout
+    python setup.py install
+}
+
+install_fedora_git_post() {
+    for fname in $(echo "minion master syndic"); do
+        if [ $fname != "minion" ]; then
+            # Guess we should only enable and start the minion service. Right??
+            continue
+        fi
+        #cp ${SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-$fname /etc/rc.d/init.d/salt-$fname
+        cp ${SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-$fname.service /lib/systemd/system/salt-$fname.service
+        #chmod +x /etc/rc.d/init.d/salt-$fname
+
+        # Switch from forking to simple, dunny why I can't make it work
+        sed -i 's/Type=forking/Type=simple/g' /lib/systemd/system/salt-$fname.service
+        # Remove the daemon flag because of the above
+        sed -ie 's;ExecStart=\(.*\) -d;ExecStart=\1;' /lib/systemd/system/salt-$fname.service
+        systemctl preset salt-$fname.service
+        systemctl enable salt-$fname.service
+        sleep 0.2
+        systemctl daemon-reload
+        sleep 0.2
+        systemctl start salt-$fname.service
+    done
+}
+#
+#   Ended Fedora Install Functions
+#
+##############################################################################
+
 ##############################################################################
 #
 #   CentOS Install Functions
 #
 install_centos_63_stable_deps() {
-    rpm -Uvh --force http://mirrors.kernel.org/fedora-epel/6/x86_64/epel-release-6-7.noarch.rpm
+    if [ $CPU_ARCH_L = "i686" ]; then
+        local ARCH="i386"
+    else
+        local ARCH=$CPU_ARCH_L
+    fi
+    rpm -Uvh --force http://mirrors.kernel.org/fedora-epel/6/${ARCH}/epel-release-6-7.noarch.rpm
     yum -y update
 }
 
@@ -411,13 +632,185 @@ install_centos_63_stable() {
 
 install_centos_63_stable_post() {
     /sbin/chkconfig salt-minion on
-    salt-minion start &
+    /etc/init.d/salt-minion start
+}
+
+install_centos_63_git_deps() {
+    install_centos_63_stable_deps
+    yum -y install git PyYAML m2crypto python-crypto python-msgpack python-zmq python-jinja2 --enablerepo=epel-testing
+}
+
+install_centos_63_git() {
+    rm -rf /usr/lib/python*/site-packages/salt
+    rm -rf /usr/bin/salt*
+
+    __git_clone_and_checkout
+    python2 setup.py install
+    mkdir -p /etc/salt/
+}
+
+install_centos_63_git_post() {
+    cp pkg/rpm/salt-{master,minion} /etc/init.d/
+    chmod +x /etc/init.d/salt-{master,minion}
+    /sbin/chkconfig salt-minion on
+    /etc/init.d/salt-minion start
 }
 #
 #   Ended CentOS Install Functions
 #
 ##############################################################################
 
+
+##############################################################################
+#
+#   Arch Install Functions
+#
+install_arch_stable_deps() {
+    echo '[salt]
+Server = http://red45.org/archlinux
+' >> /etc/pacman.conf
+}
+
+install_arch_git_deps() {
+    echo '[salt]
+    Server = http://red45.org/archlinux
+    ' >> /etc/pacman.conf
+}
+
+install_arch_stable() {
+    pacman -Sy --noconfirm pacman
+    pacman -Syu --noconfirm salt
+}
+
+install_arch_git() {
+    pacman -Sy --noconfirm pacman
+    pacman -Syu --noconfirm salt git
+    rm -rf /usr/lib/python2.7/site-packages/salt*
+    rm -rf /usr/bin/salt-*
+
+    __git_clone_and_checkout
+
+    python2 setup.py install
+}
+
+install_arch_post() {
+    /etc/rc.d/salt-minion start
+}
+#
+#   Ended Arch Install Functions
+#
+##############################################################################
+
+##############################################################################
+#
+#   FreeBSD Install Functions
+#
+install_freebsd_90_stable_deps() {
+    if [ "$CPU_VENDOR_ID_L" = "AuthenticAMD" -a $CPU_ARCH_L = "x86_64" ]; then
+        local ARCH="amd64"
+    elif [ "$CPU_VENDOR_ID_L" = "GenuineIntel" -a $CPU_ARCH_L = "x86_64" ]; then
+        local ARCH="x86:64"
+    elif [ "$CPU_VENDOR_ID_L" = "GenuineIntel" -a $CPU_ARCH_L = "i386" ]; then
+        local ARCH="i386"
+    elif [ "$CPU_VENDOR_ID_L" = "GenuineIntel" -a $CPU_ARCH_L = "i686" ]; then
+        local ARCH="x86:32"
+    else
+        local ARCH=$CPU_ARCH
+    fi
+
+    portsnap fetch extract update
+    cd /usr/ports/ports-mgmt/pkg
+    make install clean
+    cd
+    /usr/local/sbin/pkg2ng
+    echo "PACKAGESITE: http://pkgbeta.freebsd.org/freebsd-9-${ARCH}/latest" > /usr/local/etc/pkg.conf
+}
+
+install_freebsd_git_deps() {
+    if [ "$CPU_VENDOR_ID_L" = "AuthenticAMD" -a $CPU_ARCH_L = "x86_64" ]; then
+        local ARCH="amd64"
+    elif [ "$CPU_VENDOR_ID_L" = "GenuineIntel" -a $CPU_ARCH_L = "x86_64" ]; then
+        local ARCH="x86:64"
+    elif [ "$CPU_VENDOR_ID_L" = "GenuineIntel" -a $CPU_ARCH_L = "i386" ]; then
+        local ARCH="i386"
+    elif [ "$CPU_VENDOR_ID_L" = "GenuineIntel" -a $CPU_ARCH_L = "i686" ]; then
+        local ARCH="x86:32"
+    else
+        local ARCH=$CPU_ARCH
+    fi
+
+    portsnap fetch extract update
+    cd /usr/ports/ports-mgmt/pkg
+    make install clean
+    cd
+    /usr/local/sbin/pkg2ng
+    echo "PACKAGESITE: http://pkgbeta.freebsd.org/freebsd-9-${ARCH}/latest" > /usr/local/etc/pkg.conf
+}
+
+install_freebsd_90_stable() {
+    /usr/local/sbin/pkg install -y salt
+}
+
+install_freebsd_git() {
+    /usr/local/sbin/pkg install -y git salt
+    /usr/local/sbin/pkg delete -y salt
+
+    __git_clone_and_checkout
+
+    /usr/local/bin/python setup.py install
+}
+
+install_freebsd_90_stable_post() {
+    salt-minion -d
+}
+
+install_freebsd_git_post() {
+    salt-minion -d
+}
+#
+#   Ended FreeBSD Install Functions
+#
+##############################################################################
+
+
+##############################################################################
+#
+#   Default minion configuration function. Matches ANY distribution as long as
+# the -c options is passed.
+#
+config_minion() {
+    # If the configuration directory is not passed, return
+    [ "$TEMP_CONFIG_DIR" = "null" ] && return
+    # If the configuration directory does not exist, error out
+    if [ ! -d "$TEMP_CONFIG_DIR" ]; then
+        echo " * The configuration directory ${TEMP_CONFIG_DIR} does not exist."
+        exit 1
+    fi
+
+    # Let's create the necessary directories
+    [ -d /etc/salt ] || mkdir /etc/salt
+    [ -d /etc/salt/pki ] || mkdir /etc/salt/pki && chmod 700 /etc/salt/pki
+
+    # Copy the minions configuration if found
+    [ -f "$TEMP_CONFIG_DIR/minion" ] && mv "$TEMP_CONFIG_DIR/minion" /etc/salt
+
+    # Copy the minion's keys if found
+    if [ -f "$TEMP_CONFIG_DIR/minion.pem" ]; then
+        mv "$TEMP_CONFIG_DIR/minion.pem" /etc/salt/pki
+        chmod 400 /etc/salt/pki/minion.pem
+    fi
+    if [ -f "$TEMP_CONFIG_DIR/minion.pub" ]; then
+        mv "$TEMP_CONFIG_DIR/minion.pub" /etc/salt/pki
+        chmod 664 /etc/salt/pki/minion.pub
+    fi
+}
+#
+#  Ended Default Configuration function
+#
+##############################################################################
+
+
+
 #=============================================================================
 # LET'S PROCEED WITH OUR INSTALLATION
 #=============================================================================
@@ -449,16 +842,34 @@ for FUNC_NAME in $INSTALL_FUNC_NAMES; do
 done
 
 
-# Let's get the dependencies install function
+# Let's get the minion config function
+CONFIG_MINION_FUNC="null"
+if [ "$TEMP_CONFIG_DIR" != "null" ]; then
+    CONFIG_FUNC_NAMES="config_${DISTRO_NAME_L}${DISTRO_VERSION_NO_DOTS}_${ITYPE}_minion"
+    CONFIG_FUNC_NAMES="$CONFIG_FUNC_NAMES config_${DISTRO_NAME_L}${DISTRO_VERSION_NO_DOTS}_minon"
+    CONFIG_FUNC_NAMES="$CONFIG_FUNC_NAMES config_${DISTRO_NAME_L}_${ITYPE}_minion"
+    CONFIG_FUNC_NAMES="$CONFIG_FUNC_NAMES config_${DISTRO_NAME_L}_minion"
+    CONFIG_FUNC_NAMES="$CONFIG_FUNC_NAMES config_minion"
+
+    for FUNC_NAME in $CONFIG_FUNC_NAMES; do
+        if __function_defined $FUNC_NAME; then
+            CONFIG_MINION_FUNC=$FUNC_NAME
+            break
+        fi
+    done
+fi
+
+
+# Let's get the post install function
 POST_FUNC_NAMES="install_${DISTRO_NAME_L}${DISTRO_VERSION_NO_DOTS}_${ITYPE}_post"
-POST_FUNC_NAMES="$DEP_FUNC_NAMES install_${DISTRO_NAME_L}${DISTRO_VERSION_NO_DOTS}_post"
-POST_FUNC_NAMES="$DEP_FUNC_NAMES install_${DISTRO_NAME_L}_${ITYPE}_post"
-POST_FUNC_NAMES="$DEP_FUNC_NAMES install_${DISTRO_NAME_L}_post"
+POST_FUNC_NAMES="$POST_FUNC_NAMES install_${DISTRO_NAME_L}${DISTRO_VERSION_NO_DOTS}_post"
+POST_FUNC_NAMES="$POST_FUNC_NAMES install_${DISTRO_NAME_L}_${ITYPE}_post"
+POST_FUNC_NAMES="$POST_FUNC_NAMES install_${DISTRO_NAME_L}_post"
 
 POST_INSTALL_FUNC="null"
 for FUNC_NAME in $POST_FUNC_NAMES; do
     if __function_defined $FUNC_NAME; then
-        DEPS_INSTALL_FUNC=$FUNC_NAME
+        POST_INSTALL_FUNC=$FUNC_NAME
         break
     fi
 done
@@ -469,7 +880,7 @@ if [ $DEPS_INSTALL_FUNC = "null" ]; then
     exit 1
 fi
 
-if [ $DEPS_INSTALL_FUNC = "null" ]; then
+if [ $INSTALL_FUNC = "null" ]; then
     echo " * ERROR: No installation function found. Exiting..."
     exit 1
 fi
@@ -478,16 +889,39 @@ fi
 # Install dependencies
 echo " * Running ${DEPS_INSTALL_FUNC}()"
 $DEPS_INSTALL_FUNC
+if [ $? -ne 0 ]; then
+    echo " * Failed to run ${DEPS_INSTALL_FUNC}()!!!"
+    exit 1
+fi
 
 # Install Salt
 echo " * Running ${INSTALL_FUNC}()"
 $INSTALL_FUNC
+if [ $? -ne 0 ]; then
+    echo " * Failed to run ${INSTALL_FUNC}()!!!"
+    exit 1
+fi
+
+# Configure Salt
+if [ "$TEMP_CONFIG_DIR" != "null" -a "$CONFIG_MINION_FUNC" != "null" ]; then
+    echo " * Running ${CONFIG_MINION_FUNC}()"
+    $CONFIG_MINION_FUNC
+    if [ $? -ne 0 ]; then
+        echo " * Failed to run ${CONFIG_MINION_FUNC}()!!!"
+        exit 1
+    fi
+fi
 
 # Run any post install function
 if [ "$POST_INSTALL_FUNC" != "null" ]; then
     echo " * Running ${POST_INSTALL_FUNC}()"
     $POST_INSTALL_FUNC
+    if [ $? -ne 0 ]; then
+        echo " * Failed to run ${POST_INSTALL_FUNC}()!!!"
+        exit 1
+    fi
 fi
 
 # Done!
 echo " * Salt installed!"
+exit 0

data/vagrant-salt.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "vagrant-salt"
-  s.version     = "0.1.4"
+  s.version     = "0.2.0"
   s.authors     = ["Alec Koumjian", "Kiall Mac Innes", "Pedro Algarvio"]
   s.email       = ["akoumjian@gmail.com", "kiall@managedit.ie", "pedro@algarvio.me"]
   s.homepage    = "https://github.com/saltstack/salty-vagrant"

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alec Koumjian
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-19 00:00:00 -07:00
+date: 2012-11-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency