vagrant-skytap 0.1.11 → 0.2.0

data/_patches-20160118/local-configs-ignore

@@ -0,0 +1,61 @@
+# HG changeset patch
+# Parent 9e196ca30da26298aa093d37c9baa3016113de9e
+# Parent  813456f18a2d7810c0785efa925e2516a7fa5729
+local configs. Ready to commit below this line -----------------------------------------
+
+diff -r 813456f18a2d .agignore
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/.agignore	Fri Jan 08 11:51:56 2016 -0800
+@@ -0,0 +1,8 @@
++#syntax: glob
++.hg
++.vagrant*
++dotvagrant
++*.diff
++_patches*
++.byebug*
++eng-*
+diff -r 813456f18a2d .hgignore
+--- a/.hgignore	Tue Jan 05 13:24:28 2016 -0800
++++ b/.hgignore	Fri Jan 08 11:51:56 2016 -0800
+@@ -14,9 +14,16 @@
+ ^Gemfile\.lock$
+ 
+ # Vagrant
+-^\.vagrant$
+-^Vagrantfile$
++^\.vagrant
++^dotvagrant
++#^Vagrantfile$
+ #!example_box/Vagrantfile
+ 
+ # RVM files for gemset/ruby setting
+ \.ruby-version$
++
++^\.project
++\.diff
++^_patches
++^\.byebug
++^eng-
+diff -r 813456f18a2d Gemfile
+--- a/Gemfile	Tue Jan 05 13:24:28 2016 -0800
++++ b/Gemfile	Fri Jan 08 11:51:56 2016 -0800
+@@ -1,6 +1,7 @@
+ source "https://rubygems.org"
+ 
+ gemspec
++gem "byebug"
+ 
+ group :development do
+   # We depend on Vagrant for development, but we don't add it as a
+@@ -10,9 +11,8 @@
+     gem 'vagrant', path: "../vagrant"
+   else
+     # TODO test against tip
+-    gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v1.7.2'
++    gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v1.7.4'
+   end
+-  gem "byebug"
+ 
+ 
+   if File.exist?(File.expand_path("../../vagrant-spec", __FILE__))

data/_patches-20160118/misc

@@ -0,0 +1,79 @@
+# HG changeset patch
+# Parent 0dabf10f761d085b4fb8833f84c1b3a438015087
+G.D. acceptance test(s)!
+
+diff --git a/spec/acceptance/provider/status_spec.rb b/spec/acceptance/provider/status_spec.rb
+new file mode 100644
+--- /dev/null
++++ b/spec/acceptance/provider/status_spec.rb
+@@ -0,0 +1,26 @@
++shared_examples 'provider/status' do |provider, options|
++  if !options[:box]
++    raise ArgumentError,
++          "box option must be specified for provider: #{provider}"
++  end
++
++  include_context 'acceptance'
++
++  before do
++    environment.skeleton('generic')
++    assert_execute('vagrant', 'box', 'add', 'skytap-dummy', options[:box])
++    #assert_execute('vagrant', 'up', "--provider=#{provider}")
++  end
++
++  after do
++    assert_execute('vagrant', 'destroy', '--force')
++  end
++
++  it 'should show status' do
++    status("Test: can show status")
++    result = execute("vagrant", "status")
++    expect(result).to exit_with(0)
++    #expect(result.stdout).to match(/vm1\s+not created/)
++    expect(result.stdout).to match(/vm1\s+not created \(skytap\)/)
++  end
++end
+diff --git a/spec/acceptance/skeletons/generic/Vagrantfile b/spec/acceptance/skeletons/generic/Vagrantfile
+--- a/spec/acceptance/skeletons/generic/Vagrantfile
++++ b/spec/acceptance/skeletons/generic/Vagrantfile
+@@ -2,14 +2,16 @@
+   config.vm.box = "skytap-dummy"
+ 
+   config.vm.provider :skytap do |skytap, override|
+-    skytap.username = "user"
+-    skytap.api_token = "9999999999999999999999"
+-    skytap.base_url = "https://example.com/"
++    skytap.username = "vagrant_provider_admin"
++    skytap.api_token = "7c5718531a32eb90e92c804ce1f73da98be22cdf"
++    skytap.base_url = "https://test.skytap.com/"
+   end
+ 
+   config.vm.define "vm1" do |ubuntu|
+     ubuntu.vm.provider :skytap do |box|
+-      box.vm_url = "https://example.com/vms/1"
++      box.vm_url = "https://test.skytap.com/vms/6863190"
+     end
++    config.ssh.host = '127.0.0.1'
++    config.ssh.port = "22"
+   end
+ end
+diff --git a/spec/acceptance/skeletons/generic/skytap-dummy b/spec/acceptance/skeletons/generic/skytap-dummy
+new file mode 100644
+index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f9eefb302ee552c8d3c6ad929f4946988d2857fd
+GIT binary patch
+literal 167
+zc$|~(=3sc`<q^Wb{Pw&f*C7Le)`#n=yCyK7F!7B3VAi;7K~nTA4UdoS!nm8dcWEpA
+zx&O@2fG7W);?HC1`>l`dJH1U&X=?GSnWdrogU%S~=d9#<+#?tswQ`Ecxm!lTn*!(a
+zPoMF}BK&2Ik7Dc9y_IWo_uq-M3w-}aICx!JmBjDY3pp3x)0Xw${)Bz*{m=2!nHiA5
+Qnkt6NmOI}uXfQAU04kYD3;+NC
+
+diff --git a/spec/acceptance/skeletons/generic/skytap-dummy.box b/spec/acceptance/skeletons/generic/skytap-dummy.box
+new file mode 100644
+index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f9eefb302ee552c8d3c6ad929f4946988d2857fd
+GIT binary patch
+literal 167
+zc$|~(=3sc`<q^Wb{Pw&f*C7Le)`#n=yCyK7F!7B3VAi;7K~nTA4UdoS!nm8dcWEpA
+zx&O@2fG7W);?HC1`>l`dJH1U&X=?GSnWdrogU%S~=d9#<+#?tswQ`Ecxm!lTn*!(a
+zPoMF}BK&2Ik7Dc9y_IWo_uq-M3w-}aICx!JmBjDY3pp3x)0Xw${)Bz*{m=2!nHiA5
+Qnkt6NmOI}uXfQAU04kYD3;+NC
+

data/_patches-20160118/network-unreachable

@@ -0,0 +1,31 @@
+# HG changeset patch
+# Parent 3ea4ed6d64784874bd83eec8022c452858582802
+The error message for ENETUNREACH, in case we ever need it
+
+diff -r 3ea4ed6d6478 -r 07650da5cc24 lib/vagrant-skytap/errors.rb
+--- a/lib/vagrant-skytap/errors.rb	Thu Nov 05 19:23:56 2015 -0800
++++ b/lib/vagrant-skytap/errors.rb	Thu Nov 05 19:24:09 2015 -0800
+@@ -66,6 +66,10 @@
+       class NoConnectionOptions < VagrantSkytapError
+         error_key(:no_connection_options)
+       end
++
++      class NetworkUnreachable < VagrantSkytapError
++        error_key(:network_unreachable)
++      end
+     end
+   end
+ end
+diff -r 3ea4ed6d6478 -r 07650da5cc24 locales/en.yml
+--- a/locales/en.yml	Thu Nov 05 19:23:56 2015 -0800
++++ b/locales/en.yml	Thu Nov 05 19:24:09 2015 -0800
+@@ -73,6 +73,9 @@
+         Host path: %{hostpath}
+         Error: %{err}
+ 
++      network_unreachable: |-
++        The network was unreachable. This can occur when an environment is first created.
++
+       does_not_exist: |-
+         %{object_name} was not found.
+ 

data/_patches-20160118/new-boxfile

@@ -0,0 +1,288 @@
+# HG changeset patch
+# Parent 04af363aa9954a577b32c915fdd5f25c11e6510c
+# Parent  aa27fbed31fcb99c72b098e9b66df848cd8ff73e
+[mq]: new-boxfile
+
+diff --git a/Vagrantfile b/Vagrantfile
+--- a/Vagrantfile
++++ b/Vagrantfile
+@@ -1,67 +1,83 @@
+ Vagrant.configure(2) do |config|
+-  config.vm.box = "skytap-dummy"
+-  config.vm.synced_folder ".", "/vagrant", disabled: true
+-
+-  config.vm.provider :skytap do |skytap, override|
+-    skytap.username = "etrue"
+-    skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
+-    skytap.base_url = "https://cloud.skytap.com/"
+-    #skytap.username = "vagrant_provider_admin"
+-    #skytap.api_token = "7c5718531a32eb90e92c804ce1f73da98be22cdf"
+-    #skytap.base_url = "https://test.skytap.com/"
+-    #skytap.username = "jsmith"
+-    #skytap.api_token = "754be5220955f35840498340606b4dfa89f7eb61"
+-    #skytap.base_url = "https://cloud.skytap.dev/"
++  config.vm.define "vm1" do |server|
++    server.vm.box = "skytap/vm-3157858"
++    server.vm.provider :skytap do |box|
++      box.cpus = 1
++    end
+   end
+-
+-  GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
+-  # for test user
+-  #GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/4840008'
+-  # local user
+-  #GENERIC_UBUNTU = 'https://cloud.skytap.dev/vms/374'
+-
+-  UBUNTU1 = "https://cloud.skytap.com/vms/7285844"
+-  UBUNTU2 = "https://cloud.skytap.com/vms/7285846"
+-  UBUNTU_WITH_VAGRANT = "https://cloud.skytap.com/vms/7397734"
+-
+-
+-  # separate template
+-  # another ubuntu  = 'https://cloud.skytap.com/vms/7242466'
+-  WINDOWS_WINRM_CONFIGURED = 'https://cloud.skytap.com/vms/7242468'
+-
+-  config.vm.define "vm1" do |ubuntu|
+-    ubuntu.vm.hostname = "vm1"
+-    ubuntu.vm.provider :skytap do |box|
+-      box.vm_url = UBUNTU1#GENERIC_UBUNTU
+-      #box.cpus = 1
+-      #box.cpuspersocket = 1
+-      #box.ram = 1024
+-      #box.guestos = "ubuntu"
++  config.vm.define "vm2" do |server|
++    server.vm.box = "skytap/vm-7285844"
++    server.vm.provider :skytap do |box|
++      box.cpus = 1
+     end
+-    ubuntu.vm.synced_folder "~/test1", "/synced", type: :nfs
+-    ubuntu.vm.communicator = :ssh
+-    ubuntu.ssh.username = "skytap"
+-    ubuntu.ssh.password = "ChangeMe!"
+-  end
+-
+-  config.vm.define "vm2" do |windows|
+-    windows.vm.provider :skytap do |box, override|
+-      box.vm_url = WINDOWS_WINRM_CONFIGURED
+-      override.vm.guest = "windows"
+-    end
+-    windows.vm.communicator = :winrm
+-  end
+-  config.winrm.username = 'Administrator'
+-  config.winrm.password = 'admin'
+-
+-  config.vm.define "vm3" do |ubuntu|
+-    ubuntu.vm.hostname = "vm3"
+-    ubuntu.vm.provider :skytap do |box|
+-      box.vm_url = UBUNTU2#GENERIC_UBUNTU
+-    end
+-    ubuntu.vm.communicator = :ssh
+-    ubuntu.ssh.username = "skytap"
+-    ubuntu.ssh.password = "CarpYe$$$"
+-    ubuntu.vm.synced_folder "~/test2", "/synced", type: :nfs
+   end
+ end
++
++
++#Vagrant.configure(2) do |config|
++#  config.vm.box = "skytap/empty"
++#  config.vm.synced_folder ".", "/vagrant", disabled: true
++#
++#  config.vm.provider :skytap do |skytap, override|
++#    skytap.username = "etrue"
++#    skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
++#    #skytap.username = "vagrant_provider_admin"
++#    #skytap.api_token = "7c5718531a32eb90e92c804ce1f73da98be22cdf"
++#    #skytap.base_url = "https://test.skytap.com/"
++#    #skytap.username = "jsmith"
++#    #skytap.api_token = "754be5220955f35840498340606b4dfa89f7eb61"
++#    #skytap.base_url = "https://cloud.skytap.dev/"
++#  end
++#
++#  GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
++#  # for test user
++#  #GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/4840008'
++#  # local user
++#  #GENERIC_UBUNTU = 'https://cloud.skytap.dev/vms/374'
++#
++#  UBUNTU1 = "https://cloud.skytap.com/vms/7285844"
++#  UBUNTU2 = "https://cloud.skytap.com/vms/7285846"
++#  UBUNTU_WITH_VAGRANT = "https://cloud.skytap.com/vms/7397734"
++#  UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_A = "https://cloud.skytap.com/vms/7457184"
++#  UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_B = "https://cloud.skytap.com/vms/7468766"
++#
++#  # separate template
++#  # another ubuntu  = 'https://cloud.skytap.com/vms/7242466'
++#  WINDOWS_WINRM_CONFIGURED = 'https://cloud.skytap.com/vms/7242468'
++#
++#  config.vm.define "vm1" do |ubuntu|
++#    ubuntu.vm.hostname = "vm1"
++#    ubuntu.vm.provider :skytap do |box|
++#      box.vm_url = UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_A#GENERIC_UBUNTU
++#      #box.cpus = 1
++#      #box.cpuspersocket = 1
++#      #box.ram = 1024
++#      #box.guestos = "ubuntu"
++#    end
++#    ubuntu.vm.synced_folder "~/test1", "/synced", type: :nfs
++#    ubuntu.vm.communicator = :ssh
++#    ubuntu.ssh.username = "skytap"
++#    ubuntu.ssh.password = "ChangeMe!"
++#  end
++##
++##  config.vm.define "vm2" do |windows|
++##    windows.vm.provider :skytap do |box, override|
++##      box.vm_url = WINDOWS_WINRM_CONFIGURED
++##      override.vm.guest = "windows"
++##    end
++##    windows.vm.communicator = :winrm
++##  end
++##  config.winrm.username = 'Administrator'
++##  config.winrm.password = 'admin'
++#
++#  config.vm.define "vm3" do |ubuntu|
++#    ubuntu.vm.hostname = "vm3"
++#    ubuntu.vm.provider :skytap do |box|
++#      box.vm_url = UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_B#GENERIC_UBUNTU
++#    end
++#    ubuntu.vm.communicator = :ssh
++#    ubuntu.ssh.username = "skytap"
++#    ubuntu.ssh.password = "CarpYe$$$"
++#    ubuntu.vm.synced_folder "~/test2", "/synced", type: :nfs
++#  end
++#end
+diff --git a/example_box/Vagrantfile b/example_box/Vagrantfile
+--- a/example_box/Vagrantfile
++++ b/example_box/Vagrantfile
+@@ -1,8 +1,5 @@
+-# -*- mode: ruby -*-
+-# vi: set ft=ruby :
+-
+-Vagrant.configure("2") do |config|
+-  config.vm.provider :aws do |aws|
+-    aws.ami = "ami-7747d01e"
++Vagrant.configure(2) do |config|
++  config.vm.provider :skytap do |skytap|
++    skytap.vm_url = "https://cloud.skytap.com/vms/3157858"
+   end
+ end
+diff --git a/example_box/metadata.json b/example_box/metadata.json
+--- a/example_box/metadata.json
++++ b/example_box/metadata.json
+@@ -1,3 +1,3 @@
+ {
+-    "provider": "aws"
++    "provider": "skytap"
+ }
+diff --git a/example_box/skytap-3157858.box b/example_box/skytap-3157858.box
+new file mode 100644
+index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..460c11de4737e8e8ecd2f970010212c9b7919fcc
+GIT binary patch
+literal 293
+zc$@(x0owi_iwFQ4GdWfO1MSq!YJ@Nl2k<@n6v0z_iAmJB2>TknmY{LFtzX0_l-hT1
+z)@=9CgFO_xEc|~U8O;de#|(`cZB?nPqOU{O?zX@flSx9(YbNEgGU3m?I3-+2E=A0R
+zkc9Dsr|FKcO{)1}9IP^~6m89@SMpq1Rjus%Cn4AMPJ9H!347B`r&60RC*kn+ZdD%!
+zpTVt*gU!+CNga)9ZFQ>Ge*eGtt^WnjuKgb;nd|>pX6XNaaryeR=-TRZ9F2YukEHC#
+z>@Uo2Jot!C4gH=HB=<97N%Y~o%n={E)aTLE<Uqm~Yx^OOqN47`l3uopu8F2*h+>{*
+r`*a_=TXkCo=i}C|0{{R3000000000000000;O=|@^bNPb04M+e$=j0|
+
+diff --git a/lib/vagrant-skytap/action.rb b/lib/vagrant-skytap/action.rb
+--- a/lib/vagrant-skytap/action.rb
++++ b/lib/vagrant-skytap/action.rb
+@@ -127,6 +127,7 @@
+       # key.
+       def self.action_read_state
+         Vagrant::Action::Builder.new.tap do |b|
++          b.use HandleBox
+           b.use ConfigValidate
+           b.use InitializeAPIClient
+           b.use FetchEnvironment
+diff --git a/newvf1 b/newvf1
+new file mode 100644
+--- /dev/null
++++ b/newvf1
+@@ -0,0 +1,50 @@
++# This sample Vagrantfile creates a Skytap environment
++# with two VMs from a VM in the public template library.
++# Any combination of template VMs may be used as long as
++# all are in the same region.
++
++Vagrant.configure(2) do |config|
++  config.vm.box = "skytap/empty"
++
++  config.vm.provider :skytap do |skytap|
++    # Replace these values with your Skytap username and API token
++    skytap.username = "<username>"
++    skytap.api_token = "<api_token>"
++  end
++
++  # This section defines a web server using an Ubuntu VM from
++  # public template library (specified by vm_url), with its
++  # hardware settings upgraded to a quad-core CPU and 2GB of RAM.
++  # Only the vm_url property is required.
++  config.vm.define "web" do |webserver|
++    webserver.vm.provider :skytap do |box|
++      box.vm_url = "https://cloud.skytap.com/vms/3157858"
++      box.cpus = 4
++      box.cpuspersocket = 4
++      box.ram = 2048
++    end
++    # Uncomment the following line to mount a directory on your
++    # local machine (replace path1 with an existing directory) as
++    # an NFS share named "/synced" on the VM.
++    # webserver.vm.synced_folder "<path1>", "/synced", type: :nfs
++  end
++
++  # This section defines a second VM with different hardware
++  # settings. Although it uses the same vm_url as above, VMs
++  # from other templates (or the same template) can be combined
++  # as long as they are all in the same region.
++  config.vm.define "db" do |db_server|
++    db_server.vm.provider :skytap do |box|
++      box.vm_url = "https://cloud.skytap.com/vms/3157858"
++      box.cpus = 8
++      box.cpuspersocket = 4
++      box.ram = 8192
++    end
++    # Uncomment the following line to mount a directory on your
++    # local machine (replace path2 with an existing directory) as
++    # an NFS share named "/synced" on the VM.
++    # db_server.vm.synced_folder "<path1>", "/synced", type: :nfs
++  end
++end
++
++
+diff --git a/newvf2 b/newvf2
+new file mode 100644
+--- /dev/null
++++ b/newvf2
+@@ -0,0 +1,28 @@
++https://docs.vagrantup.com/v2/multi-machine/
++# This sample Vagrantfile creates a Skytap
++# environment with two VMs. Each VM may be
++# created using a different vm_url.
++
++Vagrant.configure(2) do |config|
++  config.vm.box = "skytap/empty"
++
++  config.vm.provider :skytap do |skytap|
++    skytap.username = "<username>"
++    skytap.api_token = "<api_token>"
++  end
++
++  config.vm.define "web" do |web|
++    web.vm.provider :skytap do |box|
++      box.vm_url = "https://cloud.skytap.com/vms/3157858"
++      box.ram = 4096
++    end
++    # web.vm.synced_folder "<path1>", "/synced", type: :nfs
++  end
++
++  config.vm.define "mysql" do |mysql|
++    mysql.vm.provider :skytap do |box|
++      box.vm_url = "https://cloud.skytap.com/vms/3157858"
++      box.ram = 8192
++    end
++  end
++end

data/_patches-20160118/parallelization-maybe

@@ -0,0 +1,198 @@
+# HG changeset patch
+# Parent a6021cf61035f4ba44b4af13c9b2a1c17c1ea278
+diff -r a6021cf61035 -r bfcc25828768 lib/vagrant-skytap/command/start_mixins.rb
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/lib/vagrant-skytap/command/start_mixins.rb	Fri Oct 23 19:10:56 2015 -0700
+@@ -0,0 +1,52 @@
++# How do you access the source of another plugin?
++# It's possible that they deliberately prevent this
++#require 'plugins/commands/up/start_mixins'
++module VagrantPlugins
++  module Skytap
++    module Command
++      module StartMixins
++
++        # Would be nice to just extend this, then alias #build_start_options
++        # and add default options flag.
++        #include VagrantPlugins::CommandUp::StartMixins
++
++        # This adds the standard `start` command line flags to the given
++        # OptionParser, storing the result in the `options` dictionary.
++        #
++        # @param [OptionParser] parser
++        # @param [Hash] options
++        def build_start_options(parser, options)
++          # Setup the defaults
++          options[:provision_types] = nil
++
++          # Add the options
++          parser.on("--[no-]provision", "Enable or disable provisioning") do |p|
++            options[:provision_enabled] = p
++            options[:provision_ignore_sentinel] = true
++          end
++
++          parser.on("--provision-with x,y,z", Array,
++                  "Enable only certain provisioners, by type.") do |list|
++            options[:provision_types] = list.map { |type| type.to_sym }
++            options[:provision_enabled] = true
++            options[:provision_ignore_sentinel] = true
++          end
++
++          options[:parallel] = false ### the only substantive change
++        end
++
++        # This validates the provisioner flags and raises an exception
++        # if there are invalid ones.
++        def validate_provisioner_flags!(options)
++          (options[:provision_types] || []).each do |type|
++              klass = Vagrant.plugin("2").manager.provisioners[type]
++              if !klass
++                raise Vagrant::Errors::ProvisionerFlagInvalid,
++                  name: type.to_s
++              end
++          end
++        end
++      end
++    end
++  end
++end
+diff -r a6021cf61035 -r bfcc25828768 lib/vagrant-skytap/command/up.rb
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/lib/vagrant-skytap/command/up.rb	Fri Oct 23 19:10:56 2015 -0700
+@@ -0,0 +1,110 @@
++require 'optparse'
++require_relative 'start_mixins'
++
++module VagrantPlugins
++  module Skytap
++    module Command
++      class Up < Vagrant.plugin("2", :command)
++        include StartMixins
++
++        def self.synopsis
++          "hi mom starts and provisions the vagrant environment"
++        end
++
++        def execute
++          options = {}
++          options[:destroy_on_error] = true
++          options[:parallel] = true
++          options[:provision_ignore_sentinel] = false
++
++          opts = OptionParser.new do |o|
++            o.banner = "Usage: vagrant up [options] [name]"
++            o.separator ""
++            o.separator "Options:"
++            o.separator ""
++
++            build_start_options(o, options)
++
++            o.on("--[no-]destroy-on-error",
++                 "Destroy machine if any fatal error happens (default to true)") do |destroy|
++              options[:destroy_on_error] = destroy
++            end
++
++            o.on("--[no-]parallel",
++                 "Enable or disable parallelism if provider supports it") do |parallel|
++              options[:parallel] = parallel
++            end
++
++            o.on("--provider PROVIDER", String,
++                 "Back the machine with a specific provider") do |provider|
++              options[:provider] = provider
++            end
++          end
++
++          # Parse the options
++          argv = parse_options(opts)
++          return if !argv
++
++          # Validate the provisioners
++          validate_provisioner_flags!(options)
++
++          # Go over each VM and bring it up
++          @logger.debug("'Up' each target VM...")
++
++          # Build up the batch job of what we'll do
++          machines = []
++          @env.batch(options[:parallel]) do |batch|
++            names = argv
++            if names.empty?
++              autostart = false
++              @env.vagrantfile.machine_names_and_options.each do |n, o|
++                autostart = true if o.key?(:autostart)
++                o[:autostart] = true if !o.key?(:autostart)
++                names << n.to_s if o[:autostart]
++              end
++
++              # If we have an autostart key but no names, it means that
++              # all machines are autostart: false and we don't start anything.
++              names = nil if autostart && names.empty?
++            end
++
++            if names
++              with_target_vms(names, provider: options[:provider]) do |machine|
++                @env.ui.info(I18n.t(
++                  "vagrant.commands.up.upping",
++                  name: machine.name,
++                  provider: machine.provider_name))
++
++                machines << machine
++
++                batch.action(machine, :up, options)
++              end
++            end
++          end
++
++          if machines.empty?
++            @env.ui.info(I18n.t("vagrant.up_no_machines"))
++            return 0
++          end
++
++          # Output the post-up messages that we have, if any
++          machines.each do |m|
++            next if !m.config.vm.post_up_message
++            next if m.config.vm.post_up_message == ""
++
++            # Add a newline to separate things.
++            @env.ui.info("", prefix: false)
++
++            m.ui.success(I18n.t(
++              "vagrant.post_up_message",
++              name: m.name.to_s,
++              message: m.config.vm.post_up_message))
++          end
++
++          # Success, exit status 0
++          0
++        end
++      end
++    end
++  end
++end
+diff -r a6021cf61035 -r bfcc25828768 lib/vagrant-skytap/plugin.rb
+--- a/lib/vagrant-skytap/plugin.rb	Fri Oct 23 19:10:47 2015 -0700
++++ b/lib/vagrant-skytap/plugin.rb	Fri Oct 23 19:10:56 2015 -0700
+@@ -24,7 +24,7 @@
+         Config
+       end
+ 
+-      provider(:skytap, parallel: true) do
++      provider(:skytap, parallel: false) do
+         # Setup logging and i18n
+         setup_logging
+         setup_i18n
+@@ -34,6 +34,13 @@
+         Provider
+       end
+ 
++      # only used for this provider, right? when you call vagrant up,
++      # the Vagrantfile tells it that skytap is the only allowable provider
++      command("up", primary: true) do
++        require_relative "command/up"
++        Command::Up
++      end
++
+       # This initializes the internationalization strings.
+       def self.setup_i18n
+         I18n.load_path << File.expand_path("locales/en.yml", Skytap.source_root)