tnargav 1.2.3 → 1.3.3

data/plugins/provisioners/salt/errors.rb

@@ -0,0 +1,11 @@
+require "vagrant"
+
+module VagrantPlugins
+  module Salt
+    module Errors
+      class SaltError < Vagrant::Errors::VagrantError
+        error_namespace("salt")
+      end
+    end
+  end
+end

data/plugins/provisioners/salt/plugin.rb

@@ -0,0 +1,22 @@
+require "vagrant"
+
+module VagrantPlugins
+  module Salt
+    class Plugin < Vagrant.plugin("2")
+      name "salt"
+      description <<-DESC
+      Provisions virtual machines using SaltStack
+      DESC
+
+      config(:salt, :provisioner) do
+        require File.expand_path("../config", __FILE__)
+        Config
+      end
+
+      provisioner(:salt) do
+        require File.expand_path("../provisioner", __FILE__)
+        Provisioner
+      end
+    end
+  end
+end

data/plugins/provisioners/salt/provisioner.rb

@@ -0,0 +1,249 @@
+require 'json'
+
+module VagrantPlugins
+  module Salt
+    class Provisioner < Vagrant.plugin("2", :provisioner)
+      def provision
+        upload_configs
+        upload_keys
+        run_bootstrap_script
+        call_highstate
+      end
+
+      # Return a list of accepted keys
+      def keys(group='minions')
+        out = @machine.communicate.sudo("salt-key --out json") do |type, output|
+          begin
+            if type == :stdout
+              out = JSON::load(output)
+              break out[group]
+            end
+          end
+        end
+        return out
+      end
+
+      ## Utilities
+      def expanded_path(rel_path)
+        Pathname.new(rel_path).expand_path(@machine.env.root_path)
+      end
+
+      def binaries_found
+        ## Determine States, ie: install vs configure
+        desired_binaries = []
+        if !@config.no_minion
+          desired_binaries.push('salt-minion')
+          desired_binaries.push('salt-call')
+        end
+
+        if @config.install_master
+          desired_binaries.push('salt-master')
+        end
+
+        if @config.install_syndic
+          desired_binaries.push('salt-syndic')
+        end
+
+        found = true
+        for binary in desired_binaries
+          @machine.env.ui.info "Checking if %s is installed" % binary
+          if !@machine.communicate.test("which %s" % binary)
+            @machine.env.ui.info "%s was not found." % binary
+            found = false
+          else
+            @machine.env.ui.info "%s found" % binary
+          end
+        end
+
+        return found
+      end
+
+      def need_configure
+        @config.minion_config or @config.minion_key or @config.master_config or @config.master_key
+      end
+
+      def need_install
+        if @config.always_install
+          return true
+        else
+          return !binaries_found()
+        end
+      end
+
+      def temp_config_dir
+        return @config.temp_config_dir || "/tmp"
+      end
+
+      # Generates option string for bootstrap script
+      def bootstrap_options(install, configure, config_dir)
+        options = ""
+
+        ## Any extra options passed to bootstrap
+        if @config.bootstrap_options
+          options = "%s %s" % [options, @config.bootstrap_options]
+        end
+
+        if configure
+          options = "%s -c %s" % [options, config_dir]
+        end
+
+        if @config.seed_master and @config.install_master
+          seed_dir = "/tmp/minion-seed-keys"
+          @machine.communicate.sudo("mkdir -p -m777 #{seed_dir}")
+          @config.seed_master.each do |name, keyfile|
+            sourcepath = expanded_path(keyfile).to_s
+            dest = "#{seed_dir}/seed-#{name}.pub"
+            @machine.communicate.upload(sourcepath, dest)
+          end
+          options = "#{options} -k #{seed_dir}"
+        end
+
+        if configure and !install
+          options = "%s -C" % options
+        else
+
+          if @config.install_master
+            options = "%s -M" % options
+          end
+
+
+
+          if @config.install_syndic
+            options = "%s -S" % options
+          end
+
+          if @config.no_minion
+            options = "%s -N" % options
+          end
+
+          if @config.install_type
+            options = "%s %s" % [options, @config.install_type]
+          end
+
+          if @config.install_args
+            options = "%s %s" % [options, @config.install_args]
+          end
+        end
+
+        if @config.verbose
+          @machine.env.ui.info "Using Bootstrap Options: %s" % options
+        end
+
+        return options
+      end
+
+      ## Actions
+      # Get pillar string to pass with the salt command
+      def get_pillar
+        " pillar='#{@config.pillar_data.to_json}'" if !@config.pillar_data.empty?
+      end
+
+      # Copy master and minion configs to VM
+      def upload_configs
+        if @config.minion_config
+          @machine.env.ui.info "Copying salt minion config to vm."
+          @machine.communicate.upload(expanded_path(@config.minion_config).to_s, temp_config_dir + "/minion")
+        end
+
+        if @config.master_config
+          @machine.env.ui.info "Copying salt master config to vm."
+          @machine.communicate.upload(expanded_path(@config.master_config).to_s, temp_config_dir + "/master")
+        end
+      end
+
+      # Copy master and minion keys to VM
+      def upload_keys
+        if @config.minion_key and @config.minion_pub
+          @machine.env.ui.info "Uploading minion keys."
+          @machine.communicate.upload(expanded_path(@config.minion_key).to_s, temp_config_dir + "/minion.pem")
+          @machine.communicate.upload(expanded_path(@config.minion_pub).to_s, temp_config_dir + "/minion.pub")
+        end
+
+        if @config.master_key and @config.master_pub
+          @machine.env.ui.info "Uploading master keys."
+          @machine.communicate.upload(expanded_path(@config.master_key).to_s, temp_config_dir + "/master.pem")
+          @machine.communicate.upload(expanded_path(@config.master_pub).to_s, temp_config_dir + "/master.pub")
+        end
+      end
+
+      # Get bootstrap file location, bundled or custom
+      def get_bootstrap
+        if @config.bootstrap_script
+          bootstrap_abs_path = expanded_path(@config.bootstrap_script)
+        else
+          bootstrap_abs_path = Pathname.new("../bootstrap-salt.sh").expand_path(__FILE__)
+        end
+
+        return bootstrap_abs_path
+      end
+
+      # Determine if we are configure and/or installing, then do either
+      def run_bootstrap_script
+        install = need_install()
+        configure = need_configure()
+        config_dir = temp_config_dir()
+        options = bootstrap_options(install, configure, config_dir)
+
+        if configure or install
+          if configure and !install
+            @machine.env.ui.info "Salt binaries found. Configuring only."
+          else
+            @machine.env.ui.info "Bootstrapping Salt... (this may take a while)"
+          end
+
+          bootstrap_path = get_bootstrap
+          bootstrap_destination = File.join(config_dir, "bootstrap_salt.sh")
+          @machine.communicate.upload(bootstrap_path.to_s, bootstrap_destination)
+          @machine.communicate.sudo("chmod +x %s" % bootstrap_destination)
+          bootstrap = @machine.communicate.sudo("%s %s" % [bootstrap_destination, options]) do |type, data|
+            if data[0] == "\n"
+              # 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
+            if @config.verbose
+              @machine.env.ui.info(data.rstrip)
+            end
+          end
+
+          if !bootstrap
+            raise Salt::Errors::SaltError, :bootstrap_failed
+          end
+
+          if configure and !install
+            @machine.env.ui.info "Salt successfully configured!"
+          elsif configure and install
+            @machine.env.ui.info "Salt successfully configured and installed!"
+          elsif !configure and install
+            @machine.env.ui.info "Salt successfully installed!"
+          end
+        else
+          @machine.env.ui.info "Salt did not need installing or configuring."
+        end
+      end
+
+      def call_highstate
+        if @config.run_highstate
+          @machine.env.ui.info "Calling state.highstate... (this may take a while)"
+          if @config.install_master
+            @machine.communicate.sudo("salt '*' saltutil.sync_all")
+            @machine.communicate.sudo("salt '*' state.highstate --verbose#{get_pillar}") do |type, data|
+              if @config.verbose
+                @machine.env.ui.info(data)
+              end
+            end
+          else
+            @machine.communicate.sudo("salt-call saltutil.sync_all")
+            @machine.communicate.sudo("salt-call state.highstate -l debug#{get_pillar}") do |type, data|
+              if @config.verbose
+                @machine.env.ui.info(data)
+              end
+            end
+          end
+        else
+          @machine.env.ui.info "run_highstate set to false. Not running state.highstate."
+        end
+      end
+    end
+  end
+end

data/plugins/provisioners/shell/config.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module VagrantPlugins
   module Shell
     class Config < Vagrant.plugin("2", :config)
@@ -5,12 +7,14 @@ module VagrantPlugins
       attr_accessor :path
       attr_accessor :upload_path
       attr_accessor :args
+      attr_accessor :privileged
 
       def initialize
         @args        = UNSET_VALUE
         @inline      = UNSET_VALUE
         @path        = UNSET_VALUE
         @upload_path = UNSET_VALUE
+        @privileged  = UNSET_VALUE
       end
 
       def finalize!
@@ -18,6 +22,7 @@ module VagrantPlugins
         @inline      = nil if @inline == UNSET_VALUE
         @path        = nil if @path == UNSET_VALUE
         @upload_path = "/tmp/vagrant-shell" if @upload_path == UNSET_VALUE
+        @privileged  = true if @privileged == UNSET_VALUE
       end
 
       def validate(machine)
@@ -30,8 +35,8 @@ module VagrantPlugins
           errors << I18n.t("vagrant.provisioners.shell.no_path_or_inline")
         end
 
-        # Validate the existence of a script to upload
-        if path
+        # If it is not an URL, we validate the existence of a script to upload
+        if path && ! remote?
           expanded_path = Pathname.new(path).expand_path(machine.env.root_path)
           if !expanded_path.file?
             errors << I18n.t("vagrant.provisioners.shell.path_invalid",
@@ -51,6 +56,10 @@ module VagrantPlugins
 
         { "shell provisioner" => errors }
       end
+
+      def remote?
+        path =~ URI.regexp(["ftp", "http", "https"])
+      end
     end
   end
 end

data/plugins/provisioners/shell/provisioner.rb

@@ -1,6 +1,8 @@
 require "pathname"
 require "tempfile"
 
+require "vagrant/util/downloader"
+
 module VagrantPlugins
   module Shell
     class Provisioner < Vagrant.plugin("2", :provisioner)
@@ -28,14 +30,16 @@ module VagrantPlugins
             end
 
             # Execute it with sudo
-            comm.sudo(command) do |type, data|
+            comm.execute(command, sudo: config.privileged) do |type, data|
               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.env.ui.info(data.chomp, :color => color, :prefix => false)
+                @machine.env.ui.info(
+                  data,
+                  :color => color, :new_line => false, :prefix => false)
               end
             end
           end
@@ -50,7 +54,15 @@ module VagrantPlugins
       def with_script_file
         script = nil
 
-        if config.path
+        if config.remote?
+          download_path = @machine.env.tmp_path.join("#{@machine.id}-remote-script")
+          download_path.delete if download_path.file?
+
+          Vagrant::Util::Downloader.new(config.path, download_path).download!
+          script = download_path.read
+
+          download_path.delete
+        elsif config.path
           # Just yield the path to that file...
           root_path = @machine.env.root_path
           script = Pathname.new(config.path).expand_path(root_path).read

data/scripts/website_push_docs.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Get the parent directory of where this script is.
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
+DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
+
+# Change into that directory
+cd $DIR
+
+# Push the subtree (force)
+git push heroku-docs `git subtree split --prefix website/docs master`:master --force

data/scripts/website_push_www.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Get the parent directory of where this script is.
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
+DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
+
+# Change into that directory
+cd $DIR
+
+# Push the subtree (force)
+git push heroku-www `git subtree split --prefix website/www master`:master --force

data/templates/commands/init/Vagrantfile.erb

@@ -1,7 +1,10 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-Vagrant.configure("2") do |config|
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # All Vagrant configuration is done here. The most common configuration
   # options are documented and commented below. For a complete reference,
   # please see the online documentation at vagrantup.com.
@@ -72,7 +75,7 @@ Vagrant.configure("2") do |config|
   #
   # config.vm.provision :puppet do |puppet|
   #   puppet.manifests_path = "manifests"
-  #   puppet.manifest_file  = "init.pp"
+  #   puppet.manifest_file  = "site.pp"
   # end
 
   # Enable provisioning with chef solo, specifying a cookbooks path, roles

data/templates/commands/ssh_config/config.erb

@@ -5,7 +5,11 @@ Host <%= host_key %>
   UserKnownHostsFile /dev/null
   StrictHostKeyChecking no
   PasswordAuthentication no
+<% if private_key_path.include?(" ") -%>
   IdentityFile "<%= private_key_path %>"
+<% else -%>
+  IdentityFile <%= private_key_path %>
+<% end -%>
   IdentitiesOnly yes
   LogLevel FATAL
 <% if forward_agent -%>

data/templates/guests/coreos/etcd.service.erb

@@ -0,0 +1,10 @@
+[Unit]
+Description=Clustered etcd
+#After=docker.service
+
+[Service]
+Restart=always
+ExecStart=/usr/bin/etcd -c 4001 -s 7001 -h <%= options[:my_ip] %> <% if options[:connection_string] %>-C <%= options[:connection_string] %><% end %> -d /home/core/etcd
+
+[Install]
+WantedBy=local.target