vagrant-skytap 0.2.2 → 0.2.3

data/_patches-20160113/eng-11711

@@ -1,85 +0,0 @@
-# HG changeset patch
-# Parent 1ead463a91644fcbe466a90a609e9ca004c03ccb
-ENG-11711 Clean up redundant REST calls -- this currently does not work -- the env hash probably gets cleared for each vm
-
-diff -r 1ead463a9164 lib/vagrant-skytap/action.rb
---- a/lib/vagrant-skytap/action.rb	Fri Nov 06 19:26:22 2015 -0800
-+++ b/lib/vagrant-skytap/action.rb	Fri Nov 06 19:39:47 2015 -0800
-@@ -115,10 +115,14 @@
-       # key.
-       def self.action_read_ssh_info
-         Vagrant::Action::Builder.new.tap do |b|
--          b.use ConfigValidate
--          b.use InitializeAPIClient
--          b.use FetchEnvironment
--          b.use ReadSSHInfo
-+          b.use Call, HasSSHInfo do |env1, b1|
-+            unless env1[:result]
-+              b1.use ConfigValidate
-+              b1.use InitializeAPIClient
-+              b1.use FetchEnvironment
-+              b1.use ReadSSHInfo
-+            end
-+          end
-         end
-       end
- 
-@@ -251,6 +255,7 @@
-       autoload :ExistenceCheck, action_root.join("existence_check")
-       autoload :FetchEnvironment, action_root.join("fetch_environment")
-       autoload :InitializeAPIClient, action_root.join("initialize_api_client")
-+      autoload :HasSSHInfo, action_root.join("has_ssh_info")
-       autoload :IsRunning, action_root.join("is_running")
-       autoload :IsStopped, action_root.join("is_stopped")
-       autoload :IsSuspended, action_root.join("is_suspended")
-diff -r 1ead463a9164 lib/vagrant-skytap/action/has_ssh_info.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/vagrant-skytap/action/has_ssh_info.rb	Fri Nov 06 19:39:47 2015 -0800
-@@ -0,0 +1,19 @@
-+module VagrantPlugins
-+  module Skytap
-+    module Action
-+      # This can be used with "Call" built-in to check if the ssh info
-+      # has been read.
-+      class HasSSHInfo
-+        def initialize(app, env)
-+          @app = app
-+          @logger = Log4r::Logger.new("vagrant_skytap::action::has_ssh_info")
-+        end
-+
-+        def call(env)
-+          env[:result] = env[:machine_ssh_info].present?
-+          @app.call(env)
-+        end
-+      end
-+    end
-+  end
-+end
-diff -r 1ead463a9164 lib/vagrant-skytap/action/initialize_api_client.rb
---- a/lib/vagrant-skytap/action/initialize_api_client.rb	Fri Nov 06 19:26:22 2015 -0800
-+++ b/lib/vagrant-skytap/action/initialize_api_client.rb	Fri Nov 06 19:39:47 2015 -0800
-@@ -7,17 +7,20 @@
-       # This action initializes the API client, verifies the provided
-       # credentials, and stores the API client object in env[:api_client].
-       class InitializeAPIClient
--        def initialize(app, env)
-+        def initialize(app, env, reinitialize=false)
-           @app = app
-           @logger = Log4r::Logger.new("vagrant_skytap::action::initialize_api_client")
-+          @reinitialize = reinitialize
-         end
- 
-         def call(env)
-           @logger.info("Connecting to Skytap...")
- 
--          client = API::Client.new(env[:machine].provider_config)
--          if client.get('/configurations').code == '200'
--            env[:api_client] = client
-+          unless env[:api_client] && !@reinitialize
-+            client = API::Client.new(env[:machine].provider_config)
-+            if client.get('/configurations').code == '200'
-+              env[:api_client] = client
-+            end
-           end
- 
-           @app.call(env)

data/_patches-20160113/eng-12232-command-spec

@@ -1,236 +0,0 @@
-# HG changeset patch
-# Parent 54e776bb035d336526426643b3a371f7d04b7b0d
-ENG-12232 command publish-set show spec
-
-diff -r 54e776bb035d spec/unit/base.rb
---- a/spec/unit/base.rb	Tue Dec 15 15:11:38 2015 -0800
-+++ b/spec/unit/base.rb	Tue Dec 15 15:30:51 2015 -0800
-@@ -46,7 +46,7 @@
- ENV["VAGRANT_CWD"] = Dir.mktmpdir("vagrant")
- 
- # Set the dummy provider to the default for tests
--ENV["VAGRANT_DEFAULT_PROVIDER"] = "dummy"
-+ENV["VAGRANT_DEFAULT_PROVIDER"] = "skytap"
- 
- # Unset all host plugins so that we aren't executing subprocess things
- # to detect a host for every test.
-diff -r 54e776bb035d spec/unit/commands/publish_url/command/create_spec.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spec/unit/commands/publish_url/command/create_spec.rb	Tue Dec 15 15:30:51 2015 -0800
-@@ -0,0 +1,113 @@
-+BASE_PATH = File.expand_path('../../../..', __FILE__)
-+
-+require File.expand_path("#{BASE_PATH}/base")
-+require 'vagrant-skytap/api/publish_set'
-+require 'vagrant-skytap/api/environment'
-+require 'vagrant-skytap/command/publish_url/create'
-+require 'vagrant-skytap/command/helpers'
-+require 'vagrant-skytap/provider'
-+require 'ap'
-+
-+describe VagrantPlugins::Skytap::CommandPublishUrl::Create do
-+  include_context "unit"
-+  include_context "command plugin helpers"
-+
-+  let(:empty_environment_attrs) { JSON.load(File.read(File.join(BASE_PATH, 'skeletons', 'empty_environment.json')))}
-+  let(:vm1_attrs) { JSON.load(File.read(File.join(BASE_PATH, 'skeletons', 'vm1.json'))) }
-+  let(:vm2_attrs) { vm1_attrs.merge("id" => "6981851", "name" => "VM2") }
-+  let(:empty_publish_set_attrs) { JSON.load(File.read(File.join(BASE_PATH, 'skeletons', 'empty_publish_set.json')))}
-+
-+  let(:publish_set_attrs) do
-+    empty_publish_set_attrs.dup.tap do |ret|
-+      ret['vms'] = [
-+        {"vm_ref" => "http://example.com/vms/#{vm1_attrs['id']}"},
-+        {"vm_ref" => "http://example.com/vms/#{vm2_attrs['id']}"}
-+      ]
-+    end
-+  end
-+
-+  let(:attrs) do
-+    empty_environment_attrs.dup.tap do |ret|
-+      ret['vms'] = [vm1_attrs, vm2_attrs]
-+      ret['publish_sets'] = publish_set_attrs
-+    end
-+  end
-+
-+  let(:argv)     { [] }
-+  let(:iso_env) do
-+    # We have to create a Vagrantfile so there is a root path
-+    env = isolated_environment
-+    #debugger
-+    #env.vagrantfile("")
-+
-+    env.vagrantfile(<<-VF)
-+      Vagrant.configure("2") do |config|
-+        config.vm.box = "skytap/empty"
-+
-+        config.vm.provider :skytap do |skytap, override|
-+          skytap.base_url = "https://example.com/"
-+          skytap.username = "foo"
-+          skytap.api_token = "bar"
-+        end
-+
-+        config.vm.define "vm1" do |ubuntu|
-+          ubuntu.vm.provider :skytap do |box|
-+            box.vm_url = "vms/999"
-+          end
-+        end
-+
-+        config.vm.define "vm2" do |ubuntu|
-+          ubuntu.vm.provider :skytap do |box|
-+            box.vm_url = "vms/999"
-+          end
-+        end
-+      end
-+    VF
-+    env.create_vagrant_env
-+  end
-+
-+  subject { described_class.new(argv, iso_env) }
-+
-+  before do
-+    # don't really need, since we're reading an environment
-+    VagrantPlugins::Skytap::Provider.any_instance.stub(:state).and_return(Vagrant::MachineState.new(:running, "", ""))
-+
-+    stub_request(:get, %r{/configurations$}).to_return(status: 200, body: "")
-+    stub_request(:get, %r{/configurations/\d+}).to_return(status: 200, body: JSON.dump(attrs))
-+    stub_request(:post, %r{/configurations/\d+/publish_sets}).to_return(status: 200, body: JSON.dump(publish_set_attrs))
-+
-+    allow(VagrantPlugins::Skytap::API::Environment).to receive(:properties).and_return({'url' => '/configurations/5570024'})
-+
-+    WebMock.after_request do |request_signature, response|
-+      puts "Request #{request_signature} was made and #{response} was returned"
-+    end
-+  end
-+
-+
-+
-+  context "with --no-password" do
-+    let(:argv) { ["--no-password", "vm1", "vm2"] }
-+
-+    it "posts" do
-+      #debugger
-+      #expect { subject.execute }.to output("foo").to_stdout_from_any_process
-+      nil
-+      subject.execute
-+      expect(a_request(:post, "https://foo:bar@example.com/configurations/5570024/publish_sets").
-+        with do |req|
-+          debugger
-+          req.body == JSON.dump(
-+            name: "Vagrant publish set",
-+            publish_set_type: "single_url",
-+            vms: [
-+              {vm_ref: '/vms/6981850', access: "run_and_use"},
-+              {vm_ref: '/vms/6981851', access: "run_and_use"},
-+            ],
-+            password: ""
-+          )
-+        end).
-+        to have_been_made.once
-+
-+    end
-+  end
-+end
-diff -r 54e776bb035d spec/unit/commands/publish_url/command/show_spec.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/spec/unit/commands/publish_url/command/show_spec.rb	Tue Dec 15 15:30:51 2015 -0800
-@@ -0,0 +1,88 @@
-+BASE_PATH = File.expand_path('../../../..', __FILE__)
-+
-+require File.expand_path("#{BASE_PATH}/base")
-+require 'vagrant-skytap/api/publish_set'
-+require 'vagrant-skytap/api/environment'
-+require 'vagrant-skytap/command/publish_url/show'
-+require 'vagrant-skytap/command/helpers'
-+require 'vagrant-skytap/provider'
-+require 'ap'
-+
-+describe VagrantPlugins::Skytap::CommandPublishUrl::Show do
-+  include_context "unit"
-+  include_context "command plugin helpers"
-+
-+  let(:empty_environment_attrs) { JSON.load(File.read(File.join(BASE_PATH, 'skeletons', 'empty_environment.json')))}
-+  let(:vm1_attrs) { JSON.load(File.read(File.join(BASE_PATH, 'skeletons', 'vm1.json'))) }
-+  let(:empty_publish_set_attrs) { JSON.load(File.read(File.join(BASE_PATH, 'skeletons', 'empty_publish_set.json')))}
-+
-+  let(:attrs) do
-+    vm2_attrs = vm1_attrs.merge("id" => "6981851", "name" => "VM2")
-+    empty_environment_attrs.dup.tap do |ret|
-+      ret['vms'] = [vm1_attrs, vm2_attrs]
-+      ret['publish_sets'] = [empty_publish_set_attrs.dup]
-+      ret['publish_sets'].first['vms'] = [
-+        {"vm_ref" => "http://example.com/vms/#{vm1_attrs['id']}"},
-+        {"vm_ref" => "http://example.com/vms/#{vm2_attrs['id']}"}
-+      ]
-+    end
-+  end
-+
-+  let(:argv)     { [] }
-+  let(:iso_env) do
-+    # We have to create a Vagrantfile so there is a root path
-+    env = isolated_environment
-+    #debugger
-+    #env.vagrantfile("")
-+
-+    env.vagrantfile(<<-VF)
-+      Vagrant.configure("2") do |config|
-+        config.vm.box = "skytap/empty"
-+
-+        config.vm.provider :skytap do |skytap, override|
-+          skytap.base_url = "https://test.skytap.com/"
-+          skytap.username = "etrue"
-+          skytap.api_token = "d41e7b2f98b63844512c0d62d0e5496949d35f57"
-+          skytap.vpn_url = "https://test.skytap.com/vpns/vpn-286952"
-+        end
-+
-+        config.vm.define "vm1" do |ubuntu|
-+          ubuntu.vm.provider :skytap do |box|
-+            box.vm_url = "https://test.skytap.com/vms/6984688"
-+          end
-+          ubuntu.ssh.username = "autoadmin"
-+          ubuntu.ssh.password = "autoadmin"
-+        end
-+      end
-+    VF
-+    env.create_vagrant_env
-+  end
-+
-+  subject { described_class.new(argv, iso_env) }
-+
-+  before do
-+    # don't really need, since we're reading an environment
-+    VagrantPlugins::Skytap::Provider.any_instance.stub(:state).and_return(Vagrant::MachineState.new(:running, "", ""))
-+
-+    stub_request(:get, %r{/configurations$}).to_return(status: 200, body: "")
-+    stub_request(:get, %r{/configurations/\d+}).to_return(status: 200, body: JSON.dump(attrs))
-+    allow(VagrantPlugins::Skytap::API::Environment).to receive(:properties).and_return({'url' => '/configurations/1'})
-+
-+    WebMock.after_request do |request_signature, response|
-+      puts "Request #{request_signature} was made and #{response} was returned"
-+    end
-+  end
-+
-+
-+
-+  context "with no arguments" do
-+    #let(:argv) { [] }
-+
-+    it "shows the output" do
-+      #debugger
-+      #expect { subject.execute }.to output("foo").to_stdout_from_any_process
-+      nil
-+
-+    end
-+  end
-+end
-diff -r 54e776bb035d spec/unit/skeletons/empty_environment.json
---- a/spec/unit/skeletons/empty_environment.json	Tue Dec 15 15:11:38 2015 -0800
-+++ b/spec/unit/skeletons/empty_environment.json	Tue Dec 15 15:30:51 2015 -0800
-@@ -1,6 +1,6 @@
- {
-   "id": "5570024",
--  "url": "https://example.com/templates/5570024",
-+  "url": "https://example.com/configurations/5570024",
-   "name": "Environment 1",
-   "error": "",
-   "runstate": "running",

data/_patches-20160113/eng-12235

@@ -1,83 +0,0 @@
-# HG changeset patch
-# Parent ffe81b8c1fbc30808778011dfb11428c24e94647
-# Parent  7bf28b483ba4495c173d9316aee2d8482d9705ab
-ENG-12235 override default "vagrant share" command for Skytap provider.
-
-diff -r ffe81b8c1fbc lib/vagrant-skytap/command/share.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/vagrant-skytap/command/share.rb	Tue Dec 15 13:01:38 2015 -0800
-@@ -0,0 +1,59 @@
-+# Different behavior than the standard -- this creates a publish set
-+# and outputs the URL.
-+require_relative 'overridden_command'
-+
-+module VagrantPlugins
-+  module Skytap
-+    module Command
-+      class Share < OverriddenCommand
-+        def default_command_plugin
-+          VagrantPlugins::Share::Plugin
-+        end
-+
-+        def skytap_implementation
-+
-+          # read args to see if we've got the --fallback flag
-+          # is this destructive?
-+          debugger
-+#             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
-+
-+
-+
-+          command_class(VagrantPlugins::Skytap::Plugin, "publish-url").new(@argv, @env).execute
-+        end
-+      end
-+    end
-+  end
-+end
-+
-diff -r ffe81b8c1fbc lib/vagrant-skytap/plugin.rb
---- a/lib/vagrant-skytap/plugin.rb	Tue Dec 15 13:01:26 2015 -0800
-+++ b/lib/vagrant-skytap/plugin.rb	Tue Dec 15 13:01:38 2015 -0800
-@@ -44,6 +44,11 @@
-         Command::PublishUrlRoot
-       end
- 
-+      command("share", primary: true) do
-+        require_relative "command/share"
-+        Command::Share
-+      end
-+
-       provider_capability(:skytap, :public_address) do
-         require_relative "cap/public_address"
-         Cap::PublicAddress

data/_patches-20160113/eng-12235-override-refactor

@@ -1,140 +0,0 @@
-# HG changeset patch
-# Parent 1325e55248225f2602b39dc54aa9a3b820e65174
-# Parent  1325e55248225f2602b39dc54aa9a3b820e65174
-ENG-12235 Refactoring: OverriddenCommand class.
-* * *
-imported patch eng-12235-noodling
-
-diff -r 1325e5524822 lib/vagrant-skytap/command/overridden_command.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/vagrant-skytap/command/overridden_command.rb	Wed Dec 16 12:26:58 2015 -0800
-@@ -0,0 +1,91 @@
-+# Parent class for commands that need to dispatch to existing
-+# implementations. Registering a command with the same name
-+# as an existing command overwrites it, which can inadvertently
-+# break things for other providers.
-+
-+require 'vagrant'
-+
-+module VagrantPlugins
-+  module Skytap
-+    module Command
-+      class OverriddenCommand < Vagrant.plugin("2", :command)
-+
-+        class MixedProvidersError ; end
-+
-+        def command_name
-+          self.class.to_s.split("::").last.downcase
-+        end
-+
-+        # Look for command inside specified plugin, rather than the
-+        # command registry
-+        def command_class(plugin, name)
-+          if command = plugin.components.commands[name.to_sym].try(:first)
-+            command.call
-+          else
-+            raise "Command '#{name}' not found in plugin"
-+          end
-+        end
-+
-+        def default_command_plugin
-+          raise NotImplementedError
-+        end
-+
-+        def provider_to_use
-+          options = {}
-+          opts = OptionParser.new do |o|
-+            build_start_options(o, options)
-+            o.on("--provider PROVIDER", String) do |provider|
-+              options[:provider] = provider
-+            end
-+          end
-+
-+          if parse_options(opts) && options[:provider]
-+            # Provider on command line
-+            options[:provider].to_sym
-+          elsif @env.active_machines.empty?
-+            # No machines yet, and no provider specified
-+            @env.default_provider
-+          else
-+            # Inspect machines which have already been created.
-+            providers = @env.active_machines.collect(&:last).uniq
-+            if providers.count > 1
-+              # If the Vagrant project is heterogeneous (not all machines have
-+              # the same provider), give up.
-+              @logger.debug("This environment has active machines for multiple providers! Active machines: #{@env.active_machines}")
-+              raise MixedProvidersError
-+            else
-+              providers.first
-+            end
-+          end
-+        end
-+
-+        def execute
-+          begin
-+            provider = provider_to_use
-+          rescue MixedProvidersError
-+            # Fall back to the default implementation, which might still be
-+            # able to perform the requested operation, and if not, it will use
-+            # the default error handling.
-+          end
-+
-+          if provider == :skytap
-+            @logger.info("Calling Skytap overridden implementation of '#{command_name}' command.")
-+            skytap_implementation
-+          else
-+            @logger.info("Calling default implementation of '#{command_name}' command.")
-+            default_implementation
-+          end
-+        end
-+
-+        def default_implementation
-+          command_class(default_command_plugin, command_name).new(@argv, @env).execute
-+        end
-+
-+        def skytap_implementation
-+          raise NotImplementedError
-+        end
-+      end
-+    end
-+  end
-+end
-+
-diff -r 1325e5524822 lib/vagrant-skytap/command/up.rb
---- a/lib/vagrant-skytap/command/up.rb	Wed Dec 16 12:25:57 2015 -0800
-+++ b/lib/vagrant-skytap/command/up.rb	Wed Dec 16 12:26:58 2015 -0800
-@@ -1,25 +1,19 @@
--# We've subclassed the builtin "up" command to alter how
--# parallelization is implemented. Instead of making concurrent requests to run
--# individual VMs, we make a single REST call to update the runstates of
--# multiple VMs within the containing Skytap environment.
-+# Modified "up" implementation which runs VMs in parallel using the Skytap REST API.
- 
--require Vagrant.source_root.join("plugins/commands/up/command")
-+require_relative 'overridden_command'
-+require Vagrant.source_root.join("plugins/commands/up/start_mixins")
- 
- module VagrantPlugins
-   module Skytap
-     module Command
--      class Up < VagrantPlugins::CommandUp::Command
-+      class Up < OverriddenCommand
-+        include VagrantPlugins::CommandUp::StartMixins
- 
--        def execute
--          # This implementation of the "up" command overrides
--          # the default implementation due to load order.
--          if @env.default_provider == :skytap
--            @logger.debug("Executing Skytap 'Up' implementation.")
--          else
--            @logger.debug("Calling default 'Up' implementation.")
--            return super
--          end
-+        def default_command_plugin
-+          VagrantPlugins::CommandUp::Plugin
-+        end
- 
-+        def skytap_implementation
-           options = {}
-           options[:destroy_on_error] = true
-           options[:parallel] = true

data/_patches-20160113/eng-12240

@@ -1,103 +0,0 @@
-# HG changeset patch
-# Parent 8722732470b5a0c961d7e764f64cd20410c240db
-ENG-12240 no tty present
-
-diff -r 8722732470b5 Vagrantfile
---- a/Vagrantfile	Thu Dec 03 15:09:16 2015 -0800
-+++ b/Vagrantfile	Thu Dec 03 18:21:47 2015 -0800
-@@ -1,87 +1,17 @@
- Vagrant.configure(2) do |config|
-   config.vm.box = "skytap/empty"
--  config.vm.synced_folder ".", "/vagrant", disabled: true
-+  #rsync
- 
-   config.vm.provider :skytap do |skytap, override|
--    skytap.username = "etrue"
--    skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
--    #skytap.base_url = "https://cloud.skytap.com/"
--    skytap.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
--    #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/"
-+    #skytap.username = "<username>"
-+    #skytap.api_token = "<api_token>"
-   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"
--  FROM_US_EAST = "https://cloud.skytap.com/vms/6232386"
--  FROM_EMEA = "https://cloud.skytap.com/vms/4153172"
--  ENG11490 = "https://cloud.skytap.com/templates/696065"
--  NO_DISK = "https://cloud.skytap.com/vms/7500356"
--
--  # may be gone by the time you see this
--  ENVIRONMENT_VM = "https://cloud.skytap.com/vms/7457184"
--  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 = UBUNTU1#GENERIC_UBUNTU
--      #box.cpus = 1
--      #box.cpuspersocket = 1
--      #box.ram = 1024
--      #box.guestos = "ubuntu"
--      #box.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
-+  config.vm.define "web" do |server|
-+    server.vm.provider :skytap do |box|
-+      box.vm_url = "https://cloud.skytap.com/vms/7285844"
-+      #box.cpus = 2
-     end
--    ubuntu.vm.synced_folder "vm1", "/synced", type: :nfs
--    #ubuntu.vm.synced_folder "vm1", "/home/skytap/app", type: :nfs, :mount_options => ['actimeo=1']
--    ubuntu.vm.communicator = :ssh
--    ubuntu.ssh.username = "skytap"
--    ubuntu.ssh.password = "ChangeMe!"
--
--    ubuntu.vm.provision "shell", path: "provisioning/trivial.sh"
--    #ubuntu.vm.provision "shell", path: "provisioning/apache.sh"
--    #ubuntu.vm.provision "rails",  type: "shell", path: "provisioning/rails.sh"
--  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
--      #box.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
--    end
--    ubuntu.vm.communicator = :ssh
--    ubuntu.ssh.username = "skytap"
--    ubuntu.ssh.password = "CarpYe$$$"
--    ubuntu.vm.synced_folder "vm3", "/synced", type: :nfs
--    ubuntu.vm.provision "shell", path: "provisioning/trivial.sh"
--    #ubuntu.vm.provision "shell", path: "provisioning/mysql.sh"
-+    server.vm.synced_folder "vm1", "/synced", type: :nfs
-   end
- end
--
--

data/_patches-20160113/eng-12249

@@ -1,40 +0,0 @@
-# HG changeset patch
-# Parent 7474cf487118146a0f4fa1a2a796efffd9d0e603
-ENG-12249 insecure public key, etc. for base box
-
-diff -r 7474cf487118 vm1/vagrant
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/vm1/vagrant	Mon Dec 14 12:57:19 2015 -0800
-@@ -0,0 +1,27 @@
-+-----BEGIN RSA PRIVATE KEY-----
-+MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI
-+w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP
-+kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2
-+hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO
-+Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW
-+yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd
-+ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1
-+Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf
-+TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK
-+iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A
-+sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf
-+4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP
-+cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk
-+EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN
-+CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX
-+3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG
-+YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj
-+3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+
-+dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz
-+6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC
-+P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF
-+llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ
-+kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH
-++vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ
-+NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
-+-----END RSA PRIVATE KEY-----
-diff -r 7474cf487118 vm1/vagrant.pub
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/vm1/vagrant.pub	Mon Dec 14 12:57:19 2015 -0800
-@@ -0,0 +1,1 @@
-+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key