vagrant-skytap 0.1.7 → 0.1.8

data/Vagrantfile.keep

@@ -0,0 +1,91 @@
+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.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/"
+  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"
+    end
+
+    ubuntu.vm.network :forwarded_port, guest: 80, host: 8080
+
+    #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"
+#  end
+end
+
+

data/lib/vagrant-skytap/command/up.rb

@@ -1,25 +1,25 @@
-require 'optparse'
-
-require "vagrant"
-
-require_relative 'start_mixins'
-
-# This is a modified copy of the built-in "up" command, which alters how
+# 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.
 
+require Vagrant.source_root.join("plugins/commands/up/command")
+
 module VagrantPlugins
   module Skytap
     module Command
-      class Up < Vagrant.plugin("2", :command)
-        include StartMixins
-
-        def self.synopsis
-          "starts and provisions the vagrant environment"
-        end
+      class Up < VagrantPlugins::CommandUp::Command
 
         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
+
           options = {}
           options[:destroy_on_error] = true
           options[:parallel] = true

data/lib/vagrant-skytap/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Skytap
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-skytap
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Nick Astete
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -114,15 +114,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- bar
 - boxes/empty.box
 - boxes/metadata.json
 - boxes/README.md
 - CHANGELOG.md
-- eng-10269-cleanup.diff
-- eng-10269-tmp.diff
-- eng-10269.diff
-- eng-10269.diff.1
 - eng-10369.diff
 - Gemfile
 - lib/vagrant-skytap/action/add_vm_to_environment.rb
@@ -175,7 +170,6 @@ files:
 - lib/vagrant-skytap/api/vm.rb
 - lib/vagrant-skytap/api/vpn.rb
 - lib/vagrant-skytap/api/vpn_attachment.rb
-- lib/vagrant-skytap/command/start_mixins.rb
 - lib/vagrant-skytap/command/up.rb
 - lib/vagrant-skytap/config.rb
 - lib/vagrant-skytap/core_ext/object/blank.rb
@@ -226,6 +220,7 @@ files:
 - tasks/test.rake
 - vagrant-skytap.gemspec
 - vagrant-spec.config.rb
+- Vagrantfile.keep
 - .byebug_history
 - .gitignore
 - .hgignore
@@ -251,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-skytap
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage Skytap machines.

data/bar

@@ -1,6 +0,0 @@
-2015-11-09T18:14:57.1402+00:00 tuk1m1wfe20 wfe 5546 - - [wfe.4119d810693b013377e6005056ae425d.5546.143] perf_stat_counters.rb:109 Perf: 118||DB: 0.0ms|V: 0.0ms|GET /ibm_marketplace/subscribe html||Chrome 46.0.2490.80|406
-2015-11-09T18:14:57.1391+00:00 tuk1m1wfe20 wfe 5546 - - [wfe.4119d810693b013377e6005056ae425d.5546.143] log_subscriber.rb:105 Completed 406 Not Acceptable in 16.5ms (ActiveRecord: 0.0ms)
-2015-11-09T18:14:57.1385+00:00 tuk1m1wfe20 wfe 5546 - - [wfe.4119d810693b013377e6005056ae425d.5546.143] log_subscriber.rb:105 Filter chain halted as :verify_oauth_signature rendered or redirected
-2015-11-09T18:14:57.1375+00:00 tuk1m1wfe20 wfe 5546 - - [wfe.4119d810693b013377e6005056ae425d.5546.143] ibm_marketplace_controller.rb:636 Request did not include an OAuth consumer key.
-2015-11-09T18:14:57.1220+00:00 tuk1m1wfe20 wfe 5546 - - [wfe.4119d810693b013377e6005056ae425d.5546.143] log_subscriber.rb:105 Processing by IbmMarketplaceController#subscribe as HTML
-2015-11-09T18:14:57.0192+00:00 tuk1m1wfe20 wfe 5546 - - [wfe.4119d810693b013377e6005056ae425d.5546.143] logger.rb:31 Started GET "/ibm_marketplace/subscribe" for 66.193.98.66 at 2015-11-09 18:14:57 +0000

data/eng-10269-cleanup.diff

@@ -1,247 +0,0 @@
-# HG changeset patch
-# Parent 315fe5d07c6435fdb931fb73df1aef34a8205916
-ENG-10269 the last mandatory bit of cleanup: how we capture provide vm state
-
-diff -r 315fe5d07c64 lib/vagrant-skytap/action.rb
---- a/lib/vagrant-skytap/action.rb	Fri Nov 20 12:31:47 2015 -0800
-+++ b/lib/vagrant-skytap/action.rb	Fri Nov 20 19:19:54 2015 -0800
-@@ -168,11 +168,11 @@
-         end
-       end
- 
--      # Some middlewares perform further actions after the succeeding
--      # middleware returns. Provision and SyncedFolders, specifically,
--      # both require the machine to be booted on the way back. This
--      # requirement can be satisfied by putting the WaitForCommunicator
--      # middleware later in the sequence.
-+      # Note: Provision and SyncedFolders perform actions before and after
-+      # calling the next middleware in the sequence. Both require that
-+      # the machine be booted before those calls return. This requirement
-+      # can be satisfied by putting the WaitForCommunicator middleware
-+      # later in the sequence.
-       def self.action_prepare_boot
-         Vagrant::Action::Builder.new.tap do |b|
-           b.use PrepareNFSSettings
-@@ -185,19 +185,27 @@
- 
-       def self.action_resume
-         Vagrant::Action::Builder.new.tap do |b|
--          b.use action_up
-+          Vagrant::Action::Builder.new.tap do |b|
-+            b.use InitializeAPIClient
-+            b.use FetchEnvironment
-+            b.use Call, IsSuspended do |env, b1|
-+              if env[:result]
-+                b1.use MessageResuming
-+                b1.use RunVm
-+                b1.use WaitForCommunicator
-+              end
-+            end
-+          end
-         end
-       end
- 
--      # This action is called to bring the box up from nothing.
--      def self.action_up
--        Vagrant::Action::Builder.new.tap do |b|
--          b.use action_create
--          b.use action_run_vm
--        end
--      end
-+      # The Skytap provider has a modified "vagrant up" command which
-+      # takes advantage of parallel runstate operations on Skytap
-+      # environments. The create and update_hardware actions are
-+      # separated from the run_vm action, so we can pass in the ids
-+      # and initial states for all machines to be run, potentially
-+      # with a single REST call.
- 
--      # This action is called by our modified "up" command.
-       def self.action_create
-         Vagrant::Action::Builder.new.tap do |b|
-           b.use HandleBox
-@@ -217,6 +225,13 @@
-             b1.use StoreExtraData
-             b1.use SetUpVm
-           end
-+        end
-+      end
-+
-+      def self.action_update_hardware
-+        Vagrant::Action::Builder.new.tap do |b|
-+          b.use InitializeAPIClient
-+          b.use FetchEnvironment
-           b.use Call, IsStopped do |env, b1|
-             if env[:result]
-               b1.use UpdateHardware
-@@ -226,28 +241,25 @@
-         end
-       end
- 
--      # This action is called by our modified "up" command after
--      # all the VMs have been created. The action is called once
--      # for each machine, but by default, the RunEnvironment
--      # middleware will run all the machines in parallel; after
--      # the first invocation, RunEnvironment is a no-op.
-       def self.action_run_vm
-         Vagrant::Action::Builder.new.tap do |b|
-           b.use InitializeAPIClient
-           b.use FetchEnvironment
-+
-           b.use Call, InitialState do |env, b1|
-             case env[:result]
-             when :running
-               b1.use MessageAlreadyRunning
-               next
-             when :suspended
--              b1.use Message, "The machine will be resumed"
--            when :stopped
-+              b1.use MessageResuming
-+            else
-               b1.use action_prepare_boot
-             end
--
-             b1.use Call, IsParallelized do |env2, b2|
-               if env2[:result]
-+                # Note: RunEnvironment is a no-op after
-+                # the first invocation.
-                 b2.use RunEnvironment
-               else
-                 b2.use RunVm
-@@ -263,13 +275,17 @@
-           b.use ConfigValidate
-           b.use InitializeAPIClient
-           b.use FetchEnvironment
--          b.use Call, ExistenceCheck do |env, b2|
-+          b.use Call, ExistenceCheck do |env, b1|
-             case env[:result]
-             when :missing_environment, :missing_vm, :no_vms
--              b2.use MessageNotCreated
-+              b1.use MessageNotCreated
-             else
--              b2.use action_halt
--              b2.use action_up
-+              b1.use action_halt
-+              b1.use action_update_hardware
-+              # We don't need to store the initial states
-+              # before calling run_vm, because the default
-+              # behavior is to treat the VMs as powered off.
-+              b1.use action_run_vm
-             end
-           end
-         end
-@@ -294,6 +310,7 @@
-       autoload :MessageAlreadyRunning, action_root.join("message_already_running")
-       autoload :MessageNotCreated, action_root.join("message_not_created")
-       autoload :MessageEnvironmentUrl, action_root.join("message_environment_url")
-+      autoload :MessageResuming, action_root.join("message_resuming")
-       autoload :MessageWillNotDestroy, action_root.join("message_will_not_destroy")
-       autoload :PrepareNFSSettings, action_root.join("prepare_nfs_settings")
-       autoload :PrepareNFSValidIds, action_root.join("prepare_nfs_valid_ids")
-diff -r 315fe5d07c64 lib/vagrant-skytap/action/initial_state.rb
---- a/lib/vagrant-skytap/action/initial_state.rb	Fri Nov 20 12:31:47 2015 -0800
-+++ b/lib/vagrant-skytap/action/initial_state.rb	Fri Nov 20 19:19:54 2015 -0800
-@@ -1,9 +1,8 @@
- module VagrantPlugins
-   module Skytap
-     module Action
--      # This is specifically for the "up" action. When we run in parallel, we have
--      # to know which machines were initially powered off so we can set up operations
--      # which will happen after the machine is ready
-+      # Our modified "up" command captures the VM states in the initial_states hash
-+      # before running them, potentially in parallel.
-       class InitialState
-         def initialize(app, env)
-           @app = app
-@@ -11,7 +10,8 @@
-         end
- 
-         def call(env)
--          env[:result] = env[:initial_states][env[:machine].id]
-+          # if initial_states is absent, result is nil
-+          env[:result] = env[:initial_states].try(:[], env[:machine].id)
-           @app.call(env)
-         end
-       end
-diff -r 315fe5d07c64 lib/vagrant-skytap/action/message_resuming.rb
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/vagrant-skytap/action/message_resuming.rb	Fri Nov 20 19:19:54 2015 -0800
-@@ -0,0 +1,16 @@
-+module VagrantPlugins
-+  module Skytap
-+    module Action
-+      class MessageResuming
-+        def initialize(app, env)
-+          @app = app
-+        end
-+
-+        def call(env)
-+          env[:ui].info(I18n.t("vagrant_skytap.resuming"))
-+          @app.call(env)
-+        end
-+      end
-+    end
-+  end
-+end
-diff -r 315fe5d07c64 lib/vagrant-skytap/action/run_environment.rb
---- a/lib/vagrant-skytap/action/run_environment.rb	Fri Nov 20 12:31:47 2015 -0800
-+++ b/lib/vagrant-skytap/action/run_environment.rb	Fri Nov 20 19:19:54 2015 -0800
-@@ -3,8 +3,9 @@
- module VagrantPlugins
-   module Skytap
-     module Action
--      # Runs multiple VMs in parallel. The :first_machine flag is used to prevent
--      # redundant REST calls on subsequent invocations.
-+      # Runs multiple VMs in parallel. This middleware will be invoked for
-+      # each machine, so we set the :first_machine flag to prevent redundant
-+      # REST calls.
-       class RunEnvironment
-         include Vagrant::Util::Retryable
- 
-diff -r 315fe5d07c64 lib/vagrant-skytap/command/up.rb
---- a/lib/vagrant-skytap/command/up.rb	Fri Nov 20 12:31:47 2015 -0800
-+++ b/lib/vagrant-skytap/command/up.rb	Fri Nov 20 19:19:54 2015 -0800
-@@ -60,7 +60,6 @@
-           # Go over each VM and bring it up
-           @logger.debug("'Up' each target VM...")
- 
--          # Create the VMs, then pass all the machines to the run action
-           machines = []
-           names = argv
-           if names.empty?
-@@ -85,15 +84,9 @@
- 
-               machines << machine
-               machine.action(:create, options)
-+              machine.action(:update_hardware, options)
-             end
- 
--            # Capture states before the parallel runstate operation.
--            # Checking state is relatively expensive. we should be smarter
--            # about what information to capture. For example, we can
--            # determine which machines were newly created, and put them in
--            # the :stopped collection. Or call them :created? No, that
--            # would likely be confusing
--            #require_boot = machines.select{|m| m.state.id == :stopped}
-             initial_states = machines.inject({}) do |acc, m|
-               acc[m.id] = m.state.id
-               acc
-@@ -103,7 +96,6 @@
-               machine.action(:run_vm, options.merge(
-                 first_machine:  i == 0,
-                 machines:       machines,
--                #require_boot:   require_boot,
-                 initial_states: initial_states
-               ))
-             end
-diff -r 315fe5d07c64 locales/en.yml
---- a/locales/en.yml	Fri Nov 20 12:31:47 2015 -0800
-+++ b/locales/en.yml	Fri Nov 20 19:19:54 2015 -0800
-@@ -22,6 +22,8 @@
-       Stopping the instance...
-     terminating: |-
-       Terminating the instance...
-+    resuming: |-
-+      Resuming the suspended instance ...
-     waiting_for_ready: |-
-       Waiting for instance to become "ready"...
-     waiting_for_ssh: |-