vagrant-salt 0.2.0 → 0.3.1

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "scripts"]
+	path = scripts
+	url = git://github.com/saltstack/salt-bootstrap.git

data/README.rst

@@ -245,7 +245,9 @@ Installing from source
 1. ``wget https://github.com/saltstack/salty-vagrant/tarball/master -O salty-vagrant.tar.gz``
 2. ``tar zxf salty-vagrant.tar.gz``
 3. ``cd saltstack-salty-vagrant-[hash]``
-4. ``gem build vagrant-salt.gemspec``
-5. ``vagrant gem install vagrant-salt-[version].gem``
+4. ``git submodule init``
+5. ``git submodule update``
+6. ``gem build vagrant-salt.gemspec``
+7. ``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/scripts/README.rst

@@ -0,0 +1,130 @@
+Bootstrapping Salt
+==================
+
+Before `Salt`_ can be used for provisioning on the desired machine, the 
+binaries need to be installed. Since `Salt`_ supports many different 
+distributions and versions of operating systems, the `Salt`_ installation 
+process is handled by this shell script ``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.
+
+
+One Line Bootstrap
+------------------
+
+If you're looking for the *one-liner* to install salt...
+
+For example, using ``curl`` to install latest git:
+
+.. code:: console
+
+  curl -L http://bootstrap.saltstack.org | sudo sh -s git develop
+
+
+Or, using ``wget`` to install your distribution's stable packages:
+
+.. code:: console
+
+  wget -O - http://bootstrap.saltstack.org | sudo sh
+
+If you have certificate issues using ``wget`` try the following:
+
+.. code:: console
+
+  wget --no-check-certificate -O - http://bootstrap.saltstack.org | sudo sh
+
+
+If you already have python installed, then it's as easy as:
+
+.. code:: console
+
+  python -m urllib "http://bootstrap.saltstack.org" | sudo sh -s git develop
+
+
+
+Adding support for other operating systems
+------------------------------------------
+In order to install salt for a distribution you need to define:
+
+1. To Install Dependencies, which is required, one of:
+
+.. code:: bash
+
+  install_<distro>_<distro_version>_<install_type>_deps
+  install_<distro>_<distro_version>_deps
+  install_<distro>_<install_type>_deps
+  install_<distro>_deps
+
+
+2. To install salt, which, of course, is required, one of:
+
+.. code:: bash
+
+  install_<distro>_<distro_version>_<install_type>
+  install_<distro>_<install_type>
+
+
+3. Optionally, define a minion configuration function, which will be called if 
+   the ``-c|config-dir`` option is passed. One of:
+
+.. code:: bash
+
+  config_<distro>_<distro_version>_<install_type>_minion
+  config_<distro>_<distro_version>_minion
+  config_<distro>_<install_type>_minion
+  config_<distro>_minion
+  config_minion [THIS ONE IS ALREADY DEFINED AS THE DEFAULT]
+
+
+4. Also optionally, define a post install function, one of:
+
+.. code:: bash
+
+  install_<distro>_<distro_versions>_<install_type>_post
+  install_<distro>_<distro_versions>_post
+  install_<distro>_<install_type>_post
+  install_<distro>_post
+
+
+Below is an example for Ubuntu Oneiric:
+
+.. code:: bash
+
+  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
+
+
+
+
+.. _`Salt`: http://saltstack.org/
+.. vim: fenc=utf-8 spell spl=en cc=100 tw=99 fo=want sts=2 sw=2 et

data/scripts/bootstrap-salt-minion.sh

@@ -14,7 +14,8 @@
 #       CREATED: 10/15/2012 09:49:37 PM WEST
 #===============================================================================
 set -o nounset                              # Treat unset variables as an error
-ScriptVersion="1.0"
+ScriptVersion="1.1"
+ScriptName="bootstrap-salt-minion.sh"
 
 #===============================================================================
 #  LET THE BLACK MAGIC BEGIN!!!!
@@ -27,7 +28,7 @@ ScriptVersion="1.0"
 usage() {
     cat << EOT
 
-  Usage :  ${0##/*/} [options] <install-type> <install-type-args>
+  Usage :  ${ScriptName} [options] <install-type> <install-type-args>
 
   Installation types:
     - stable (default)
@@ -35,12 +36,12 @@ usage() {
     - git
 
   Examples:
-    $ ${0##/*/}
-    $ ${0##/*/} stable
-    $ ${0##/*/} daily
-    $ ${0##/*/} git
-    $ ${0##/*/} git develop
-    $ ${0##/*/} git 8c3fadf15ec183e5ce8c63739850d543617e4357
+    $ ${ScriptName}
+    $ ${ScriptName} stable
+    $ ${ScriptName} daily
+    $ ${ScriptName} git
+    $ ${ScriptName} git develop
+    $ ${ScriptName} git 8c3fadf15ec183e5ce8c63739850d543617e4357
 
   Options:
   -h|help       Display this message
@@ -63,17 +64,29 @@ do
     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   ;;
+    \?              )  echo "\n  Option does not exist : $OPTARG\n"
+                       usage; exit 1   ;;
 
   esac    # --- end of case ---
 done
 shift $(($OPTIND-1))
 
+__check_unparsed_options() {
+    shellopts="$1"
+    unparsed_options=$( echo "$shellopts" | grep -E '[-]+[[:alnum:]]' )
+    if [ "x$unparsed_options" != "x" ]; then
+        usage
+        echo
+        echo " * ERROR: options come before install arguments"
+        echo
+        exit 1
+    fi
+}
 # Define installation type
 if [ "$#" -eq 0 ];then
     ITYPE="stable"
 else
+    __check_unparsed_options "$*"
     ITYPE=$1
     shift
 fi
@@ -87,12 +100,14 @@ if [ $ITYPE = "git" ]; then
     if [ "$#" -eq 0 ];then
         GIT_REV="master"
     else
+        __check_unparsed_options "$*"
         GIT_REV="$1"
         shift
     fi
 fi
 
 if [ "$#" -gt 0 ]; then
+    __check_unparsed_options "$*"
     usage
     echo
     echo " * ERROR: Too many arguments."
@@ -144,8 +159,8 @@ 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 )"
+LOGFILE="/tmp/$( echo $ScriptName | sed s/.sh/.log/g )"
+LOGPIPE="/tmp/$( echo $ScriptName | sed s/.sh/.logpipe/g )"
 
 # Create our logging pipe
 # On FreeBSD we have to use mkfifo instead of mknod
@@ -172,7 +187,7 @@ exec 2>$LOGPIPE
 #-------------------------------------------------------------------------------
 __gather_hardware_info() {
     if [ -f /proc/cpuinfo ]; then
-        CPU_VENDOR_ID=$( cat /proc/cpuinfo | grep vendor_id | head -n 1 | awk '{print $3}' )
+        CPU_VENDOR_ID=$(cat /proc/cpuinfo | grep -E 'vendor_id|Processor' | head -n 1 | awk '{print $3}' | cut -d '-' -f1 )
     else
         CPU_VENDOR_ID=$( sysctl -n hw.model )
     fi
@@ -467,6 +482,7 @@ install_ubuntu_1110_deps() {
 install_ubuntu_daily_deps() {
     apt-get update
     __apt_get_noinput python-software-properties
+    add-apt-repository -y ppa:saltstack/salt-depends
     add-apt-repository -y ppa:saltstack/salt-daily
     apt-get update
 }
@@ -532,30 +548,80 @@ install_debian_stable() {
     __apt_get_noinput salt-minion
 }
 
-install_debian_60_stable_deps() {
+install_debian_60_deps() {
     echo "deb http://backports.debian.org/debian-backports squeeze-backports main" >> \
         /etc/apt/sources.list.d/backports.list
+
+    # Add madduck's repo since squeeze packages have been deprecated
+    for i in {salt-common,salt-master,salt-minion,salt-syndic,salt-doc}; do
+        echo "Package: $i"
+        echo "Pin: release a=squeeze-backports"
+        echo "Pin-Priority: 600"
+        echo
+    done > /etc/apt/preferences.d/local-salt-backport.pref
+
+    cat <<_eof > /etc/apt/sources.list.d/local-madduck-backports.list
+deb http://debian.madduck.net/repo squeeze-backports main
+deb-src http://debian.madduck.net/repo squeeze-backports main
+_eof
+
+    wget -q http://debian.madduck.net/repo/gpg/archive.key
+    apt-key add archive.key
     apt-get update
 }
 
-install_debian_60_stable() {
-    __apt_get_noinput -t squeeze-backports salt-minion
+install_debian_60() {
+    __apt_get_noinput salt-minion
+}
+
+install_debian_git_deps() {
+    apt-get update
+    __apt_get_noinput lsb-release python python-pkg-resources python-crypto \
+        python-jinja2 python-m2crypto python-yaml msgpack-python git python-zmq
+}
+
+install_debian_git() {
+    __git_clone_and_checkout
+    python setup.py install --install-layout=deb
+
+    # Let's trigger config_minion()
+    if [ "$TEMP_CONFIG_DIR" = "null" ]; then
+        TEMP_CONFIG_DIR="${SALT_GIT_CHECKOUT_DIR}/conf/"
+        CONFIG_MINION_FUNC="config_minion"
+    fi
 }
 
 install_debian_60_git_deps() {
-    install_debian_60_stable_deps
-    install_debian_60_stable
+    install_debian_60_deps # Add backports
+    install_debian_git_deps # Grab the actual deps
 }
 
 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
+
+    # Let's trigger config_minion()
+    if [ "$TEMP_CONFIG_DIR" = "null" ]; then
+        TEMP_CONFIG_DIR="${SALT_GIT_CHECKOUT_DIR}/conf/"
+        CONFIG_MINION_FUNC="config_minion"
+    fi
+}
+
+install_debian_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
+        chmod +x /etc/init.d/salt-$fname
+        /etc/init.d/salt-$fname start
+    done
 }
 #
 #   Ended Debian Install Functions
@@ -667,13 +733,13 @@ install_centos_63_git_post() {
 #
 install_arch_stable_deps() {
     echo '[salt]
-Server = http://red45.org/archlinux
+Server = http://intothesaltmine.org/archlinux
 ' >> /etc/pacman.conf
 }
 
 install_arch_git_deps() {
     echo '[salt]
-    Server = http://red45.org/archlinux
+    Server = http://intothesaltmine.org/archlinux
     ' >> /etc/pacman.conf
 }
 
@@ -706,45 +772,43 @@ install_arch_post() {
 #   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
+    if [ $CPU_ARCH_L = "amd64" ]; 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
+    elif [ $CPU_ARCH_L = "x86_64" ]; then
+        local ARCH="x86:64"
+    elif [ $CPU_ARCH_L = "i386" ]; then
+        local ARCH="x86:32"
+    elif [ $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
+    fetch http://pkgbeta.freebsd.org/freebsd:9:${ARCH}/latest/Latest/pkg.txz
+    tar xf ./pkg.txz -s ",/.*/,,g" "*/pkg-static"
+    ./pkg-static add ./pkg.txz
     /usr/local/sbin/pkg2ng
-    echo "PACKAGESITE: http://pkgbeta.freebsd.org/freebsd-9-${ARCH}/latest" > /usr/local/etc/pkg.conf
+    echo "PACKAGESITE: http://pkgbeta.freebsd.org/freebsd:9:${ARCH}/latest" > /usr/local/etc/pkg.conf
+
+    /usr/local/sbin/pkg install -y swig
 }
 
 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
+    if [ $CPU_ARCH_L = "amd64" ]; 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
+    elif [ $CPU_ARCH_L = "x86_64" ]; then
+        local ARCH="x86:64"
+    elif [ $CPU_ARCH_L = "i386" ]; then
+        local ARCH="x86:32"
+    elif [ $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
+    fetch http://pkgbeta.freebsd.org/freebsd:9:${ARCH}/latest/Latest/pkg.txz
+    tar xf ./pkg.txz -s ",/.*/,,g" "*/pkg-static"
+    ./pkg-static add ./pkg.txz
     /usr/local/sbin/pkg2ng
-    echo "PACKAGESITE: http://pkgbeta.freebsd.org/freebsd-9-${ARCH}/latest" > /usr/local/etc/pkg.conf
+    echo "PACKAGESITE: http://pkgbeta.freebsd.org/freebsd:9:${ARCH}/latest" > /usr/local/etc/pkg.conf
+
+    /usr/local/sbin/pkg install -y swig
 }
 
 install_freebsd_90_stable() {

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.2.0"
+  s.version     = "0.3.1"
   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"
@@ -16,4 +16,28 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "vagrant"
+
+  # get an array of submodule dirs by executing 'pwd' inside each submodule
+  `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|
+    # for each submodule, change working directory to that submodule
+    Dir.chdir(submodule_path) do
+
+      # issue git ls-files in submodule's directory
+      submodule_files = `git ls-files`.split("\n")
+
+      # prepend the submodule path to create absolute file paths
+      submodule_files_fullpaths = submodule_files.map do |filename|
+        "#{submodule_path}/#{filename}"
+      end
+
+      # remove leading path parts to get paths relative to the gem's root dir
+      submodule_files_paths = submodule_files_fullpaths.map do |filename|
+        filename.gsub "#{File.dirname(File.expand_path(File.dirname(__FILE__)))}/", ""
+      end
+
+      # add relative paths to gem.files
+      s.files += submodule_files_paths
+    end
+  end
+
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 0
-  version: 0.2.0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Alec Koumjian
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-28 00:00:00 -08:00
+date: 2012-12-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .gitmodules
 - Gemfile
 - README.rst
 - Rakefile
@@ -56,8 +57,9 @@ files:
 - lib/vagrant-salt.rb
 - lib/vagrant-salt/provisioner.rb
 - lib/vagrant_init.rb
-- scripts/bootstrap-salt-minion.sh
 - vagrant-salt.gemspec
+- scripts/README.rst
+- scripts/bootstrap-salt-minion.sh
 has_rdoc: true
 homepage: https://github.com/saltstack/salty-vagrant
 licenses: []