vagrant-skytap 0.1.11 → 0.2.0

data/_patches-20160112/vm-vanished

@@ -0,0 +1,42 @@
+# HG changeset patch
+# Parent 1b8860f8b5129c2ab846c4464378c7a582ac0a90
+raise error on vm reload if it's gone?
+
+diff -r 1b8860f8b512 lib/vagrant-skytap/api/vm.rb
+--- a/lib/vagrant-skytap/api/vm.rb	Mon Nov 09 20:51:32 2015 -0800
++++ b/lib/vagrant-skytap/api/vm.rb	Mon Nov 09 20:52:02 2015 -0800
+@@ -35,6 +35,7 @@
+         end
+ 
+         def refresh_from_environment
++          raise VmVanished, name: machine.name unless vm = environment.get_vm_by_id(id)
+           refresh(vm.attrs)
+         end
+ 
+diff -r 1b8860f8b512 lib/vagrant-skytap/errors.rb
+--- a/lib/vagrant-skytap/errors.rb	Mon Nov 09 20:51:32 2015 -0800
++++ b/lib/vagrant-skytap/errors.rb	Mon Nov 09 20:52:02 2015 -0800
+@@ -27,6 +27,10 @@
+         error_key(:does_not_exist)
+       end
+ 
++      class VmVanished < VagrantSkytapError
++        error_key(:vm_vanished)
++      end
++
+       class BadVmUrl < VagrantSkytapError
+         error_key(:bad_vm_url)
+       end
+diff -r 1b8860f8b512 locales/en.yml
+--- a/locales/en.yml	Mon Nov 09 20:51:32 2015 -0800
++++ b/locales/en.yml	Mon Nov 09 20:52:02 2015 -0800
+@@ -76,6 +76,9 @@
+       does_not_exist: |-
+         %{object_name} was not found.
+ 
++      vm_vanished: |-
++        The VM '%{name}' no longer exists on Skytap.
++
+       operation_failed: |-
+         The operation failed: %{err}
+ 

data/_patches-20160112a/01

@@ -0,0 +1,148 @@
+# HG changeset patch
+# Parent b151a1a45bee7b2b6d57e9259001f2f7a8ec52a8
+# Parent  fcbbf2b6298088fecf8f0c9150e92e5624c8dbe7
+just the common host cap -- is it going the wrong way?
+
+diff -r fcbbf2b62980 lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb
+--- a/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Tue Jan 12 22:40:01 2016 -0800
++++ b/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Tue Jan 12 22:43:54 2016 -0800
+@@ -12,35 +12,32 @@
+     module HostCommon
+       module Cap
+         class SSHTunnel
+-          def self.create_logger
+-            Log4r::Logger.new("vagrant::hosts::common")
+-          end
++          def self.start_ssh_tunnel(env, fp, env_hash)
++            logger = Log4r::Logger.new("vagrant::hosts::bsd")
++            port = {
++              adapter:   fp.adapter,
++              guestip:   fp.guest_ip,
++              guestport: fp.guest_port,
++              hostip:    fp.host_ip,
++              hostport:  fp.host_port,
++              name:      fp.id,
++              protocol:  fp.protocol
++            }
+ 
+-          # called per port by ForwardPorts
+-          def self.start_ssh_tunnel(env, fp, env_hash)
+-            logger = create_logger
+-            machine = env_hash[:machine]
+-            pid = read_pid(File.join(machine.data_dir, pidfile_name(fp)))
++            pidfile = pidfile_name(port, env_hash)
++            pid = read_pid(pidfile)
+             if pid && autossh_pid?(pid)
+               logger.info("An autossh process already exists with pid #{pid}.")
+             else
+-              args = autossh_args(fp, pidfile, env_hash)
++              args = autossh_args(port, pidfile, env_hash)
+               Vagrant::Util::Subprocess.execute("autossh", *args)
+             end
+           end
+ 
+-          # called for machine by ClearForwardedPorts
+-          def self.kill_forwarded_ports(env, env_hash)
+-            get_pidfiles_for_machine(env_hash[:machine]).each do |pidfile|
+-              kill_ssh_tunnel(env, pidfile, env_hash)
+-            end
+-          end
+-
+-          # exposed but not called currently from any action
+           def self.kill_ssh_tunnel(env, pidfile, env_hash)
+-            logger = create_logger
+-            machine = env_hash[:machine]
+-            pid = read_pid(File.join(machine.data_dir, pidfile))
++            logger = Log4r::Logger.new("vagrant::hosts::bsd")
++            pidfile = File.join(env_hash[:machine].data_dir, pidfile)
++            pid = read_pid(pidfile)
+             if pid && autossh_pid?(pid)
+               Vagrant::Util::Subprocess.execute("kill", pid.to_s)
+             else
+@@ -49,26 +46,17 @@
+             end
+           end
+ 
+-          ####################################
++          private
+ 
+-          def self.pidfile_name(fp)
+-            "#{fp[:host_ip]}.pid"
++          def self.pidfile_name(port, env_hash)
++            tunnel_name = [port[:hostip], port[:name]].compact.join('_')
++            File.join(env_hash[:machine].data_dir, "#{tunnel_name}.pid")
+           end
+ 
+-          def self.read_pid(pidfile_path)
+-            File.read(pidfile_path).presence.try(:to_i) if File.exist?(pidfile_path)
++          def self.read_pid(pidfile)
++            File.read(pidfile).presence.try(:to_i) if File.exist?(pidfile)
+           end
+ 
+-          def self.get_pidfiles_for_machine(machine)
+-            pidfiles = []
+-            Vagrant::Util::SafeChdir.safe_chdir(machine.data_dir) do
+-              pidfiles = Dir.glob("*.pid")
+-            end
+-            pidfiles
+-          end
+-
+-          ####################################
+-
+           # Checks that the pid is actually an autossh process (and not
+           # something else using a recycled pid).
+           def self.autossh_pid?(pid)
+@@ -77,16 +65,23 @@
+           end
+ 
+           # Get the command, minus any arguments, for the given
+-          # pid. This probably needs to be overridden per host cap
++          # pid. I don't expect this to be compatible cross-platform yet...
++          # This could be complicated cross-platform, and Sys::ProcTable
++          # could likewise be complicated cross-platform ...
+           def self.get_comm_for_pid(pid)
+             result = Vagrant::Util::Subprocess.execute("ps", "-p", pid.to_s, "-o", "comm")
+             result.stdout.split("\n").last
+           end
+ 
+-          ####################################
++          def self.read_forwarded_ports(env, env_hash, machine = nil)
++            logger = create_logger
++            machine ||= env_hash[:machine]
++            get_pidfiles_for_machine(machine).collect do |pidfile|
++              read_pid(File.join(machine.data_dir, pidfile))
++            end
++          end
+ 
+-          def self.autossh_args(fp, pidfile, env_hash)
+-            machine = env_hash[:machine]
++          def self.autossh_args(port, pidfile, env_hash)
+             ssh_info = env_hash[:machine_ssh_info]
+             ssh_options = {
+               "ServerAliveInterval" => 10,
+@@ -96,16 +91,22 @@
+             environment_variables = {
+               env: {
+                 "AUTOSSH_PIDFILE" => pidfile,
+-                "AUTOSSH_PORT" => 0, # turn off monitoring
++                "AUTOSSH_PORT" => 0, # turns off monitoring
++                #"AUTOSSH_LOGFILE" => "./autossh.log",
+               }
+             }
++            forward_string = [
++              port[:hostport],
++              "localhost",
++              port[:guestport]
++            ].join(':')
+ 
+             autossh_args = []
+             autossh_args << "-q"
+             autossh_args << "-N"
+             autossh_args << "-f"
+-            autossh_args << "-i" << machine.data_dir.join("private_key").to_s
+-            autossh_args << "-L" << "#{fp[:host_port]}:localhost:#{fp[:guest_port]}"
++            autossh_args << "-i" << env_hash[:machine].data_dir.join("private_key").to_s
++            autossh_args << "-L" << forward_string
+             ssh_options.each do |k, v|
+               autossh_args << "-o" << "#{k}=#{v}"
+             end

data/_patches-20160112a/2

@@ -0,0 +1,239 @@
+# HG changeset patch
+# Parent 74d169c04caec5d9ccb8355c531b767d9225cf95
+diff -r 74d169c04cae -r 5e40023c756c Vagrantfile
+--- a/Vagrantfile	Tue Jan 12 14:38:22 2016 -0800
++++ b/Vagrantfile	Tue Jan 12 18:07:03 2016 -0800
+@@ -120,12 +120,12 @@
+     box.ssh.password    = vms[vm1_key][:password]
+     box.vm.communicator = vms[vm1_key][:communicator]
+     #box.vm.synced_folder "vm1", "/synced", type: :nfs, mount_options: ['actimeo=1']
+-    box.vm.synced_folder ".", "/vagrant-skytap", type: :nfs, mount_options: ['actimeo=1']
++    #box.vm.synced_folder ".", "/vagrant-skytap", type: :nfs, mount_options: ['actimeo=1']
+     #box.vm.provision "shell", path: "provisioning/trivial.sh"
+     box.vm.provision "shell", path: "provisioning/apache.sh"
+     box.vm.provision "shell", path: "provisioning/vagrant.sh"
+ 
+-    #box.vm.network :forwarded_port, guest: 80, host: 9000
++    box.vm.network :forwarded_port, guest: 80, host: 9000
+     #box.vm.network :forwarded_port, guest: 21, host: 9001
+   end
+ 
+diff -r 74d169c04cae -r 5e40023c756c lib/vagrant-skytap/action/clear_forwarded_ports.rb
+--- a/lib/vagrant-skytap/action/clear_forwarded_ports.rb	Tue Jan 12 14:38:22 2016 -0800
++++ b/lib/vagrant-skytap/action/clear_forwarded_ports.rb	Tue Jan 12 18:07:03 2016 -0800
+@@ -8,12 +8,11 @@
+       class ClearForwardedPorts
+         def initialize(app, env)
+           @app = app
+-          @env = env
+         end
+ 
+         def call(env)
+           env[:ui].info I18n.t("vagrant.actions.vm.clear_forward_ports.deleting")
+-          pidfiles = @env[:host].capability(:kill_forwarded_ports, @env)
++          env[:host].capability(:kill_forwarded_ports, env)
+ 
+           @app.call(env)
+         end
+diff -r 74d169c04cae -r 5e40023c756c lib/vagrant-skytap/action/prepare_forwarded_port_collision_params.rb
+--- a/lib/vagrant-skytap/action/prepare_forwarded_port_collision_params.rb	Tue Jan 12 14:38:22 2016 -0800
++++ b/lib/vagrant-skytap/action/prepare_forwarded_port_collision_params.rb	Tue Jan 12 18:07:03 2016 -0800
+@@ -1,3 +1,4 @@
++require 'byebug'
+ module VagrantPlugins
+   module Skytap
+     module Action
+@@ -9,22 +10,23 @@
+         def call(env)
+           # Get the forwarded ports used by other virtual machines and
+           # consider those in use as well.
+-          env[:port_collision_extra_in_use] = @env[:host].capability(:read_used_ports, @env)
++          env[:port_collision_extra_in_use] = env[:host].capability(:read_used_ports, env)
+ 
+           # Build the remap for any existing collision detections
+           remap = {}
+           env[:port_collision_remap] = remap
+-          env[:host].capability(:read_forwarded_ports, env).each do |_nic, name, hostport, _guestport|
++          env[:host].capability(:read_forwarded_ports, env).each do |name, hostport|
+             env[:machine].config.vm.networks.each do |type, options|
+               next if type != :forwarded_port
+ 
+               # If the ID matches the name of the forwarded port, then remap.
+               if options[:id] == name
+-                remap[options[:host]] = hostport
++                remap[options[:host]] = hostport # what happens with 'ssh' ?????
+                 break
+               end
+             end
+           end
++#          debugger
+ 
+           @app.call(env)
+         end
+@@ -32,3 +34,6 @@
+     end
+   end
+ end
++
++#[_nic,ssh,    2222,22]
++#[_nic,tcp3001,3001,3001]
+diff -r 74d169c04cae -r 5e40023c756c lib/vagrant-skytap/hosts/bsd/cap/ssh_tunnel.rb
+--- a/lib/vagrant-skytap/hosts/bsd/cap/ssh_tunnel.rb	Tue Jan 12 14:38:22 2016 -0800
++++ b/lib/vagrant-skytap/hosts/bsd/cap/ssh_tunnel.rb	Tue Jan 12 18:07:03 2016 -0800
+@@ -4,7 +4,7 @@
+   module Skytap
+     module HostBSD
+       module Cap
+-        class SSHTunnel < VagrantPlugins::Skytap::Common::Cap::SSHTunnel
++        class SSHTunnel < VagrantPlugins::Skytap::HostCommon::Cap::SSHTunnel
+           def self.create_logger
+             Log4r::Logger.new("vagrant::hosts::bsd")
+           end
+diff -r 74d169c04cae -r 5e40023c756c lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb
+--- a/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Tue Jan 12 14:38:22 2016 -0800
++++ b/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb	Tue Jan 12 18:07:03 2016 -0800
+@@ -19,18 +19,25 @@
+           # called per port by ForwardPorts
+           def self.start_ssh_tunnel(env, fp, env_hash)
+             logger = create_logger
+-            machine = env_hash[:machine]
+-            pid = read_pid(File.join(machine.data_dir, pidfile_name(fp)))
+-            if pid && autossh_pid?(pid)
+-              logger.info("An autossh process already exists with pid #{pid}.")
+-            else
+-              args = autossh_args(fp, pidfile, env_hash)
+-              Vagrant::Util::Subprocess.execute("autossh", *args)
++            pidfile = File.join(env_hash[:machine].data_dir, pidfile_name(fp))
++            if pid = read_pid(pidfile)
++              debugger
++              if autossh_pid?(pid)
++                logger.info("An autossh process already exists with pid #{pid}.")
++                return
++              else
++                logger.info("Cleaning up stale autossh pidfile #{pidfile}.")
++                Vagrant::Util::Subprocess.execute("rm", pidfile)
++              end
+             end
++            debugger
++            args = autossh_args(fp, env_hash)
++            Vagrant::Util::Subprocess.execute("autossh", *args)
+           end
+ 
+           # called for machine by ClearForwardedPorts
+           def self.kill_forwarded_ports(env, env_hash)
++#            debugger
+             get_pidfiles_for_machine(env_hash[:machine]).each do |pidfile|
+               kill_ssh_tunnel(env, pidfile, env_hash)
+             end
+@@ -40,33 +47,48 @@
+           def self.kill_ssh_tunnel(env, pidfile, env_hash)
+             logger = create_logger
+             machine = env_hash[:machine]
+-            pid = read_pid(File.join(machine.data_dir, pidfile))
+-            if pid && autossh_pid?(pid)
+-              Vagrant::Util::Subprocess.execute("kill", pid.to_s)
++            pidfile = File.join(machine.data_dir, pidfile)
++            if pid = read_pid(pidfile)
++              debugger
++              if autossh_pid?(pid)
++                myenv = {env: {"AUTOSSH_PIDFILE" => pidfile}}
++                Vagrant::Util::Subprocess.execute("kill", pid.to_s, myenv)
++              else
++                logger.info("Cleaning up stale autossh pidfile #{pidfile}.")
++                Vagrant::Util::Subprocess.execute("rm", pidfile)
++              end
+             else
+-              logger.info("Cleaning up stale autossh pidfile #{pidfile}.")
+-              Vagrant::Util::Subprocess.execute("rm", pidfile)
++              debugger
++              logger.info("Pidfile #{pidfile} not found.")
+             end
+           end
+ 
+           ####################################
+ 
+-          def self.read_forwarded_ports(env, env_hash, machine = nil)
+-            logger = create_logger
+-            machine ||= env_hash[:machine]
++          # forwarded ports used by ALL OTHER machines
++          def self.read_used_ports(env, env_hash)
++            # pretend for the moment that we don't care
++            []
++          end
++
++          # forwarded ports used by THIS machine
++          def self.read_forwarded_ports(env, env_hash)
++            machine = env_hash[:machine]
+             get_pidfiles_for_machine(machine).collect do |pidfile|
+-              read_pid(File.join(machine.data_dir, pidfile))
++              pidfile =~ /(.*)(\d+)/
++              [pidfile,$2]
+             end
+           end
+ 
+           ####################################
+ 
+           def self.pidfile_name(fp)
+-            "#{fp[:host_ip]}.pid"
++            # there's one that's just named ssh, what do we do about it?
++            "#{fp.protocol}#{fp.host_port}.pid"
+           end
+ 
+-          def self.read_pid(pidfile_path)
+-            File.read(pidfile_path).presence.try(:to_i) if File.exist?(pidfile_path)
++          def self.read_pid(pidfile)
++            File.read(pidfile).presence.try(:to_i) if File.exist?(pidfile)
+           end
+ 
+           def self.get_pidfiles_for_machine(machine)
+@@ -95,7 +117,7 @@
+ 
+           ####################################
+ 
+-          def self.autossh_args(fp, pidfile, env_hash)
++          def self.autossh_args(fp, env_hash)
+             machine = env_hash[:machine]
+             ssh_info = env_hash[:machine_ssh_info]
+             ssh_options = {
+@@ -105,7 +127,7 @@
+             }
+             environment_variables = {
+               env: {
+-                "AUTOSSH_PIDFILE" => pidfile,
++                "AUTOSSH_PIDFILE" => File.join(machine.data_dir, pidfile_name(fp)),
+                 "AUTOSSH_PORT" => 0, # turn off monitoring
+               }
+             }
+@@ -115,7 +137,7 @@
+             autossh_args << "-N"
+             autossh_args << "-f"
+             autossh_args << "-i" << machine.data_dir.join("private_key").to_s
+-            autossh_args << "-L" << "#{fp[:host_port]}:localhost:#{fp[:guest_port]}"
++            autossh_args << "-L" << "#{fp.host_port}:localhost:#{fp.guest_port}"
+             ssh_options.each do |k, v|
+               autossh_args << "-o" << "#{k}=#{v}"
+             end
+diff -r 74d169c04cae -r 5e40023c756c lib/vagrant-skytap/hosts/linux/cap/ssh_tunnel.rb
+--- a/lib/vagrant-skytap/hosts/linux/cap/ssh_tunnel.rb	Tue Jan 12 14:38:22 2016 -0800
++++ b/lib/vagrant-skytap/hosts/linux/cap/ssh_tunnel.rb	Tue Jan 12 18:07:03 2016 -0800
+@@ -4,7 +4,7 @@
+   module Skytap
+     module HostLinux
+       module Cap
+-        class SSHTunnel < VagrantPlugins::Skytap::Common::Cap::SSHTunnel
++        class SSHTunnel < VagrantPlugins::Skytap::HostCommon::Cap::SSHTunnel
+           def self.create_logger
+             Log4r::Logger.new("vagrant::hosts::linux")
+           end
+diff -r 74d169c04cae -r 5e40023c756c lib/vagrant-skytap/hosts/windows/cap/ssh_tunnel.rb
+--- a/lib/vagrant-skytap/hosts/windows/cap/ssh_tunnel.rb	Tue Jan 12 14:38:22 2016 -0800
++++ b/lib/vagrant-skytap/hosts/windows/cap/ssh_tunnel.rb	Tue Jan 12 18:07:03 2016 -0800
+@@ -4,7 +4,7 @@
+   module Skytap
+     module HostWindows
+       module Cap
+-        class SSHTunnel < VagrantPlugins::Skytap::Common::Cap::SSHTunnel
++        class SSHTunnel < VagrantPlugins::Skytap::HostCommon::Cap::SSHTunnel
+           def self.create_logger
+             Log4r::Logger.new("vagrant::hosts::windows")
+           end

data/_patches-20160112a/COMPLETED-ABOVE-THIS-LINE

@@ -0,0 +1,4 @@
+# HG changeset patch
+# Parent 21dbd7fc56837b7c7949396f0f1058790d265a5b
+(basically) finished work above this line not yet sent for CR --------------------------------------
+

data/_patches-20160112a/COMPLETED-BELOW-THIS-LINE

@@ -0,0 +1,4 @@
+# HG changeset patch
+# Parent e1ec4738b4fbbd2ef83c29f221c19cf3798cf8f0
+(basically) finished work below this line not yet sent for CR --------------------------------------
+

data/_patches-20160112a/CR-ABOVE-THIS-LINE

@@ -0,0 +1,4 @@
+# HG changeset patch
+# Parent 05bfba1f21950dc1331bb355bb60789499208a63
+Out for CR above this line ------------------------------------
+

data/_patches-20160112a/CR-BELOW-THIS-LINE

@@ -0,0 +1,4 @@
+# HG changeset patch
+# Parent faddc6f9d7ed6653fe7d86ab0943f901860b2872
+out for CR below this line ------------------------------------------
+

data/_patches-20160112a/WIP-ABOVE-THIS-LINE

@@ -0,0 +1,4 @@
+# HG changeset patch
+# Parent d9c2f15e01d69f7f9ed90c5a8504a635536409b7
+Work in progress above this line --------------------------------------------
+

data/_patches-20160112a/WIP-BELOW-THIS-LINE

@@ -0,0 +1,4 @@
+# HG changeset patch
+# Parent 1350d8d01c04611ef082a637cf69eb289b88559a
+Work in progress below this line ---------------------------------------------------------------
+

data/_patches-20160112a/acceptance-test-runner

@@ -0,0 +1,29 @@
+# HG changeset patch
+# Parent e03c705cadffcf6ca578330597f15624260a9d46
+script to run acceptance tests
+
+diff --git a/acceptance.sh b/acceptance.sh
+new file mode 100755
+--- /dev/null
++++ b/acceptance.sh
+@@ -0,0 +1,20 @@
++#!/bin/bash
++
++VAGRANT_LOG=info \
++VAGRANT_SKYTAP_USERNAME=etrue \
++VAGRANT_SKYTAP_API_TOKEN=fcb2620b72efddbc8239e25db9d812f510c7e166 \
++  rake acceptance:run \
++  COMPONENTS=provider/skytap/up
++
++#VAGRANT_SKYTAP_USERNAME=vagrant_provider_admin \
++#VAGRANT_SKYTAP_API_TOKEN=7c5718531a32eb90e92c804ce1f73da98be22cdf \
++#VAGRANT_SKYTAP_BASE_URL=https://test.skytap.com/ \
++
++
++
++#vagrant-spec test --config=vagrant-spec.config.rb --components="$COMPONENTS"
++
++
++# How do I get log output??
++# This needs to run in vagrant-spec, not just rake. Boxes have
++# to install.

data/_patches-20160112a/ansible-1

@@ -0,0 +1,92 @@
+# HG changeset patch
+# Parent 0bb10bac847b6ff55e16bc18e9e9e98b49f58444
+try to get sbrady's ansible provisioning (codename: "chuck") to work
+
+diff --git a/Vagrantfile.chuck b/Vagrantfile.chuck
+new file mode 100644
+--- /dev/null
++++ b/Vagrantfile.chuck
+@@ -0,0 +1,55 @@
++# -*- mode: ruby -*-
++# vi: set ft=ruby :
++
++VM_CPU = 4    # Cores
++VM_RAM = 4096 # GB
++GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
++
++Vagrant.configure("2") do |config|
++
++  config.vm.provider :skytap do |skytap, override|
++    skytap.username = "etrue"
++    skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
++  end
++
++  config.vm.define :dev do |dev|
++    # VMWare and VirtualBox
++    # https://vagrantcloud.com/hashicorp/boxes/precise64
++    # TODO how to specify different box files for skytap provider
++    #dev.vm.box     = "hashicorp/precise64"
++    #dev.vm.box_url = "hashicorp/precise64"
++
++
++    # dev.vm.network :private_network, ip: "10.10.10.5"
++    dev.vm.network :private_network, ip: "10.1.130.252"
++    dev.vm.network :forwarded_port, guest: 3001, host: 3001
++    dev.vm.network :forwarded_port, guest: 1080, host: 1080
++
++    dev.vm.synced_folder "~/src", "/var/www/skytap", :nfs => true, :mount_options => ['actimeo=1']
++
++    dev.vm.provider :vmware_fusion do |box|
++      box.vmx["memsize"]  = VM_RAM
++      box.vmx["numvcpus"] = VM_CPU
++    end
++
++    dev.vm.provider :virtualbox do |box|
++      box.customize ["modifyvm", :id, "--memory", VM_RAM]
++      box.customize ["modifyvm", :id, "--cpus",   VM_CPU]
++      box.customize ["modifyvm", :id, "--ioapic",   "on"]
++    end
++
++    dev.vm.provider :skytap do |box|
++      dev.vm.box = "skytap-dummy"
++      box.vm_url = GENERIC_UBUNTU
++      box.cpus = VM_CPU
++      box.ram = VM_RAM
++      box.guestos = "ubuntu"
++    end
++
++    dev.vm.provision :ansible do |ansible|
++      ansible.playbook       = "ansible/playbooks/webservers.yml"
++      # with the skytap provider, let it generate the inventory (.vagrant/provisioners/..)
++      #ansible.inventory_path = "ansible/environments/dev"
++    end
++  end
++end
+diff --git a/ansible b/ansible
+new file mode 120000
+--- /dev/null
++++ b/ansible
+@@ -0,0 +1,1 @@
++../chuck/ansible
+
+diff --git a/ansible.cfg b/ansible.cfg
+new file mode 120000
+--- /dev/null
++++ b/ansible.cfg
+@@ -0,0 +1,1 @@
++../chuck/ansible.cfg
+
+diff --git a/rake b/rake
+new file mode 120000
+--- /dev/null
++++ b/rake
+@@ -0,0 +1,1 @@
++../chuck/rake
+
+diff --git a/rakefile.rb b/rakefile.rb
+new file mode 120000
+--- /dev/null
++++ b/rakefile.rb
+@@ -0,0 +1,1 @@
++../chuck/rakefile.rb
+

data/_patches-20160112a/cache-api-client-in-up

@@ -0,0 +1,40 @@
+# HG changeset patch
+# Parent 1397b5a1cf5158f68afa12477b1de4101b8da248
+[mq]: cache-api-client-in-up
+
+diff -r 1397b5a1cf51 lib/vagrant-skytap/action/initialize_api_client.rb
+--- a/lib/vagrant-skytap/action/initialize_api_client.rb	Mon Dec 07 19:47:09 2015 -0800
++++ b/lib/vagrant-skytap/action/initialize_api_client.rb	Wed Dec 09 16:03:46 2015 -0800
+@@ -13,11 +13,15 @@
+         end
+ 
+         def call(env)
+-          @logger.info("Connecting to Skytap...")
++          unless env[:api_client]
++            @logger.info("Connecting to Skytap...")
+ 
+-          client = API::Client.new(env[:machine].provider_config)
+-          if client.get('/configurations').code == '200'
+-            env[:api_client] = client
++            client = API::Client.new(env[:machine].provider_config)
++            if client.get('/configurations').code == '200'
++              env[:api_client] = client
++            end
++          else
++            @logger.info("Using cached API client")
+           end
+ 
+           @app.call(env)
+diff -r 1397b5a1cf51 lib/vagrant-skytap/command/up.rb
+--- a/lib/vagrant-skytap/command/up.rb	Mon Dec 07 19:47:09 2015 -0800
++++ b/lib/vagrant-skytap/command/up.rb	Wed Dec 09 16:03:46 2015 -0800
+@@ -76,7 +76,8 @@
+                 provider: machine.provider_name))
+ 
+               machines << machine
+-              machine.action(:create, options)
++              result = machine.action(:create, options)
++              options[:api_client] ||= result[:api_client]
+               machine.action(:update_hardware, options)
+             end
+ 

data/_patches-20160112a/dead-code-in-actions

@@ -0,0 +1,44 @@
+# HG changeset patch
+# Parent 376d225699f6e5edced626762b20690f8a86e566
+remove dead code in actions.rb
+
+diff -r 376d225699f6 -r 57b84d076d7f lib/vagrant-skytap/action.rb
+--- a/lib/vagrant-skytap/action.rb	Tue Oct 20 13:31:40 2015 -0700
++++ b/lib/vagrant-skytap/action.rb	Tue Oct 20 13:31:55 2015 -0700
+@@ -86,17 +86,11 @@
+           b.use FetchEnvironment
+           b.use Call, EnvironmentExists do |env, b2|
+             if env[:result]
+-              b2.use Call, RunEnvironment do |env2, b3|
+-                if env2[:result]
+-                  b3.use PrepareNFSSettings
+-                  b3.use PrepareNFSValidIds
+-                  b3.use Provision
+-                  b3.use SyncedFolders
+-                else
+-                  #TODO:NLA IMPLEMENT ME
+-                  # b2.use RunFailed
+-                end
+-              end
++              b2.use RunEnvironment
++              b2.use PrepareNFSSettings
++              b2.use PrepareNFSValidIds
++              b2.use Provision
++              b2.use SyncedFolders
+             else
+               b2.use DeleteEnvironment
+               b2.use MessageNotCreated
+@@ -217,12 +211,7 @@
+             end
+           end
+           b.use action_prepare_boot
+-          b.use Call, RunVm do |env, b1|
+-            unless env[:result]
+-              #TODO:NLA IMPLEMENT ME
+-              # b2.use RunFailed
+-            end
+-          end
++          b.use RunVm
+         end
+       end
+