vagrant-skytap 0.1.11 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6898194d6dcdf6ccc89dcba1e02a441e4262ba1a
-  data.tar.gz: b7f877591cc2d209443f9e0ef4c06fff265515bd
+  metadata.gz: 9803dcd4a9599d58a78653c2feffcd9748441012
+  data.tar.gz: 9e22383d99a894143de9a12db928b8af9211e175
 SHA512:
-  metadata.gz: 2ef67a6a2c5bbdfcf088a0b9d2ff80966df2018b08c7e90bde42139a902a3de7ccc1fd5b22c8eaae76abe5b6a1b3a4e1f867ebda6961f2ac245a41c7da3e5376
-  data.tar.gz: beb9539902e8e1651f90a61e10659710ef40154e066a8b7acb712d1ed3dd1eed778c448b6bfd50009f17b39d5199e7fa5c8ff70237165dd89743e11104603b46
+  metadata.gz: a0266e176c96068c36c5133ab746c64cd4bada2febe1d9cfdd4241fa1888776a65d5013f82ab679e72b4d997123c3abacf609fecbfb4e5a0fc0847a44c58a9f7
+  data.tar.gz: 01ab3cedd7f84e7f6756d7f84d23ea714db1a48ee16cf8bea6c451a7ecf88c5786def1650a857d2364dc228516485a813db3477fa338cd84e9434267e795d986

data/.byebug_history

@@ -1,33 +1,256 @@
 c
+s
+n
 args
-args.last[:env].merge!("AUTOSSH_LOGFILE" => "/Users/bubbbbbba/autossh.log")
-args.last[:env]
+message
+finish
+object
+s
 args
-args[:env]
+self
+@method_name
+method_name
+$!
+s
+machine
+fp
+c 58
+c
+expect(map.values.first).to be_a(Pathname)
+c
+map.values.first.is_a?(Pathname)
+map.values.first.class
+map.values.first
+c
+id
+(guest_port == 22 && host_port == 2222)
+self
+c
+self
+c
+id
+(guest_port == 22 && host_port == 2222) 
+self
+c
+up
+c
+display options
+c
+up
+c
+up
+options
+c
+display fp
 c
-n
 fp
+@env[:forwarded_ports].last
+@env[:forwarded_ports]
+fp.internal_ssh_port?
+c
+cc
+c
+display fp
+c
+env[:machine].config.vm.networks.first.class
+env[:machine].config.vm.networks.first
+ap env[:machine].config.vm.networks
+c
+ap env[:port_collision_extra_in_use]
+env[:port_collision_extra_in_use]
+ports
+c
+ports
+c
+ports
+c
+ports
+env[:machine].ssh_info
+env[:machine].name
+c
+puts env[:port_collision_extra_in_use]
+env[:port_collision_extra_in_use]
+n
+c
+env[:port_collision_extra_in_use]
+c
+env[:host].capability(:read_forwarded_ports, env[:machine])
+c
+b 21
 n
-process.pid
-io_data
+c
+get_fp_from_directory(search_paths.first)
+search_paths
 n
-process.stdout.read
+s
+args
 n
-process.exit_code
+s
+c
+ap resp
+resp.body
+c
+resp.body
+c
+ap resp
+c
+ap JSON.load(resp.body)
+resp.body
+ap resp
+c
+$!
 n
-@options
-@options.delete(nil)
-@options[nil]
-@options
-@options[:env].merge!("AUTOSSH_LOGFILE" => "/blah")
-@options
-@options[:env["AUTOSSH_LOGFILE"]] = "/blah"
-@options
+c
+up
+$!
+s
+ap resp
+args
+up
+url
+c
+ap body['vms']
+ap body.keys
+ap body
+body=JSON.load(resp.body)
+n
+attrs
+c
+finish
+n
+c
+new_vm_ids
+new_vms_ids
 n
 finish
+$!
+n
 s
+args
+ap vm.attrs
+ap vm
+args
+n
+vm_ids
+n
+finish
+vm.region
+finish
+n
+ap vm.attrs
+finish
+n
+vm_url
+finish
+s
+vm_url
 c
-config.vm.networks.count
+get_api_attribute('configuration_url')
 c
-@env[:machine].name
-@env[:forwarded_ports]
+ap attrs
+attrs
+attributes
+n
+s
+c
+display pidfile
+c
+display pidfile
+c
+pidfile
+c
+$1
+'w33' =~ /(\w+)/
+'w33' =~ /(\w+/
+$1
+'w33' =~ /\w+/
+$2
+$1
+/\w+/ =~ 'w33'
+$2
+$1
+n
+pidfile
+c
+machine
+c
+machine.data_dir
+machine
+c
+env.host.capability
+env.host
+env
+c
+Object.const_get("VagrantPlugins::Skytap::HostDarwin::Cap::Processes")
+Object.const_get("HostDarwin::Cap::Processes")
+Object.const_get("HostDarwin")
+Object.const_get("Foo")
+c
+result.to_s
+result.exit_code == 0
+result.exit_code
+result = Vagrant::Util::Subprocess.execute("ps", "-p", pid.to_s, "-o", "comm")
+c
+n
+finish
+n
+pid
+c
+$!
+c
+$!
+c
+n
+finish
+n
+c
+result
+finish
+$!
+n
+pid
+c
+s
+pid
+c
+res
+n
+c
+n
+autossh_pid?(pid)
+pid
+n
+machine.data_dir
+n
+c
+puts $!.backtrace
+puts $1.backtrace
+$!
+n
+c
+pidfile_path
+File.read('foo')
+finish
+args
+finish
+$!
+s
+pidfile
+n
+c
+Pathname.new('foo')
+Pathname
+Path
+c
+$!
+n
+c
+VagrantPlugins::Skytap::Model::ForwardedPort
+Skytap::Model::ForwardedPort
+forwarded_port
+c
+VagrantPlugins::Skytap::Model::ForwardedPort
+require 'vagrant-skytap/model/forwarded_port'
+VagrantPlugins::Skytap::API
+VagrantPlugins::Skytap::sdf
+VagrantPlugins::Skytap

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.2.0 (January 20, 2016)
+
+* Add support for port forwarding on Linux and BSD hosts using AutoSSH
+  (TCP only).
+
+* 0.1.12 (December 23, 2015)
+
+* Backward-compatibility fix.
+
 # 0.1.11 (December 22, 2015)
 
 * Fix breakage caused by fix to --provision-with argument in Vagrant 1.8.0

data/README.md

@@ -2,7 +2,7 @@
 # Skytap Provider for Vagrant (Beta)
 The Skytap Vagrant provider is a [Vagrant](http://vagrantup.com) plugin for creating, provisioning, and controlling  VMs on the [Skytap](http://www.skytap.com) cloud computing platform. It allows you to:
 
-*   Create multi-VM environments using source VMs from one or more Skytap templates
+*   Create multi-VM environments using source VMs from Skytap environments and templates
 *   SSH into the instances
 *   Customize hardware settings via the Vagrantfile
 *   Sync folders between your local machine and Skytap VMs via NFS
@@ -14,8 +14,6 @@ The Skytap Vagrant provider is a [Vagrant](http://vagrantup.com) plugin for crea
 
 Skytap [environments](http://help.skytap.com/#Getting_Started_with_Environments.html) map neatly onto Vagrant multi-machine environments. An environment contains one or more VMs, and may also contain networks for the VMs to connect to. Environments may be snapshotted as [templates](http://help.skytap.com/#Templates.html), which can then be used to create new environments. The Skytap [public template library](http://help.skytap.com/#Public_Templates.html) is a collection of templates containing a variety of pre-configured VMs.
 
-
-
 ## Before You Begin
 
 Before you begin, make sure you have:
@@ -101,6 +99,7 @@ For the most part these behave identically to the builtin Vagrant commands.
 | `vagrant publish-url [action] [<vm_name>, ...]`| Share an environment via the Skytap UI. See below for specifics. |
 | `vagrant reload [<vm_name>, <vm_name>]`       | Shut down and then run an environment or VM(s); this is equivalent to `vagrant halt` followed by `vagrant up.`|
 | `vagrant resume [<vm_name>, <vm_name>]`       | Runs one or more suspended VM(s)|
+| `vagrant share [<vm_name>]`                   | Shares a VM through HashiCorp Atlas.|
 | `vagrant ssh [<vm_name>]`                     | Begin an SSH session with a VM|
 | `vagrant ssh-config [<vm_name>, <vm_name>]`   | Generate an OpenSSH configuration file based on the VM settings |
 | `vagrant status [<vm_name>, <vm_name>]`       | Show the runstate of one or more VM(s)|
@@ -117,7 +116,13 @@ Notes:
 ## Additional Supported Actions
 
 ### Sharing Environments via Published URLs
-The  Skytap Vagrant provider has basic support for [published URLs](http://help.skytap.com/#Published_URLs.html). Publishing an environment gives full anonymous access to the environment through the Skytap UI to anyone with the URL. A password may be specified. Access may be revoked by deleting the published URL with the `vagrant publish-url delete` subcommand. (Skytap users with appropriate permissions may still access the environment through the UI if desired.)
+The  Skytap Vagrant provider has basic support for [published URLs](http://help.skytap.com/#Published_URLs.html). Publishing an environment gives full anonymous access to the Skytap environment to anyone with the URL (and optional password). This feature differs from [Vagrant Share](https://www.vagrantup.com/docs/share/index.html) in that the user will have browser-based access to a shared view of all VMs in the environment, including details at a glance, thumbnails, and desktop access using SmartClient.
+
+![Shared environment view](//help.skytap.com/Content/Resources/Images/PublishedURLView.png)
+
+
+A password may be specified. Anonymous access may be revoked by deleting the published URL, using the `vagrant publish-url delete` subcommand. (Skytap users with appropriate
+permissions may still access the environment through the UI if desired.)
 
 | Vagrant Command and Subcommand                | Skytap Action  |
 |:----------------------------------------------|----------------|
@@ -146,6 +151,22 @@ end
 
 For more information, see [https://docs.vagrantup.com/v2/synced-folders](https://docs.vagrantup.com/v2/synced-folders).
 
+### Port Forwarding
+The Skytap Vagrant provider supports Vagrant's port forwarding feature using [AutoSSH](http://www.harding.motd.ca/autossh), an open-source utility for managing ssh tunnels.  The `up` and `resume` commands will start a separate autossh process for each forwarded port. The `halt` and `suspend` commands will terminate the autossh processes, which will cause the ssh tunnels to be killed. `vagrant reload` kills the autossh processes and recreates them. (Only autossh processes created by Vagrant will be killed, and only for the VMs being halted, suspended, or reloaded.)
+
+An example from the Vagrant documentation:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.network "forwarded_port", guest: 80, host: 8080,
+    auto_correct: true
+end
+```
+Note:  This feature is currently not supported on Windows hosts.
+
+For more information, see [https://www.vagrantup.com/docs/networking/forwarded_ports.html](https://www.vagrantup.com/docs/networking/forwarded_ports.html).
+
+
 ##  Skytap-specific Vagrantfile Settings
 
 |Setting               |Required?|Description|
@@ -159,8 +180,8 @@ For more information, see [https://docs.vagrantup.com/v2/synced-folders](https:/
 
 Notes:
 
-* Source VMs must come from a template, not an environment, and they must be saved in the powered off state.
-* Multi-machine environments may use source VMs from multiple templates, from your customer account and/or the public template library, as long as all are in the same region. Your user account must have permissions to see the templates containing the source VMs.
+* Source VMs cannot be used unless they are in the powered off state.
+* Multi-machine environments may use source VMs from multiple environments and templates, from your customer account and/or the public template library, as long as all are in the same region. Your user account must have permissions to see the source VMs.
 * `cpus` must be evenly divisible by `cpuspersocket`. E.g., two quad-core processors have a total of 8 virtual cores, so the `cpus` value would be 8. (Most VMs in the public template library are single-core.)
 * The `guestos` setting is distinct from from Vagrant's `config.vm.guest` setting.
 * If you do not know the URL for the VPN you wish to use, contact your Skytap administrator.
@@ -181,7 +202,8 @@ To enable logging while troubleshooting, see [https://docs.vagrantup.com/v2/othe
 * The source VM must have an SSH service configured to run on startup, or (for Windows VMs) be configured for WinRM access. For more information about WinRM configuration, see [https://docs.vagrantup.com/v2/boxes/base.html](https://docs.vagrantup.com/v2/boxes/base.html), under "Windows Boxes".
 * At this time, WinRM credentials stored in Skytap VMs will be ignored. The username and password for WinRM connections must be stored in the Vagrantfile (`config.winrm.username` and `config.winrm.password`).
 * Running, reloading, or destroying a Skytap VM can result in "stale NFS file handle" errors on other providers' VMs. This is a known issue when using multiple providers on the same host machine.  The workaround is to use `vagrant reload` on the affected VM to refresh that VM's NFS mount(s).
-* At this time, `vagrant share` is not supported.
-* High-level networking features (including port forwarding and private networks) are currently unsupported.
+* Public and private networks are not supported.
+* Port forwarding is supported for TCP only.
+* Port forwarding is currently unsupported on Windows.
 * Although several Skytap public library VMs include credentials for the `root` login, its use is not recommended.
 * Once a VM has been created, it is not possible to change its connection method (i.e., connect using a different VPN). This is the case whether the VPN is specified in the Vagrantfile with the `vpn_url` setting, or selected interactively.

data/Vagrantfile.rej

@@ -0,0 +1,83 @@
+--- Vagrantfile
++++ Vagrantfile
+@@ -85,6 +85,16 @@
+   environment_vm2: {
+     vm_url: "https://cloud.skytap.com/vms/8283794"
+   },
++  test_vagrant_customer_template_vm_1: {
++    vm_url: "https://test.skytap.com/vms/6863190",
++    username: "autoadmin",
++    password: "autoadmin",
++  },
++  test_vagrant_customer_env_vm_1: {
++    vm_url: "https://test.skytap.com/vms/7088324",
++    username: "autoadmin",
++    password: "autoadmin",
++  },
+ }.tap do |ret|
+   ret.each do |key, vm|
+     vm[:username] ||= "skytap"
+@@ -97,7 +107,7 @@
+ settings_key = :etrue_prod
+ vm1_key = :golden
+ vm2_key = :windows_winrm_configured
+-vm3_key = :ubuntu2
++vm3_key = :golden
+ #############################
+ 
+ 
+@@ -120,7 +130,7 @@
+   #end
+ 
+   config.vm.define "vm1" do |box|
+-    #box.vm.hostname = "vm1"
++    box.vm.hostname = "vm1"
+     box.vm.provider :skytap do |box|
+       box.vm_url = vms[vm1_key][:vm_url]
+       #box.cpus = 1
+@@ -132,10 +142,10 @@
+     #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.provision "shell", path: "provisioning/vagrant.sh"
+ 
+-    box.vm.network :forwarded_port, guest: 80, host: 9000
+-    #box.vm.network :forwarded_port, guest: 21, host: 9001
++    box.vm.network :forwarded_port, guest: 80, host: 9000, auto_correct: true
++    box.vm.network :forwarded_port, guest: 21, host: 9001, auto_correct: true
+   end
+ 
+ #  config.vm.define "vm2" do |box|
+@@ -149,17 +159,20 @@
+ #    box.vm.synced_folder "vm2", "/synced", type: :nfs
+ #  end
+ #
+-#  config.vm.define "vm3" do |box|
+-#    box.vm.hostname = "vm3"
+-#    box.vm.provider :skytap do |box|
+-#      box.vm_url = vms[vm3_key][:vm_url]
+-#    end
+-#    box.ssh.username    = vms[vm3_key][:username]
+-#    box.ssh.password    = vms[vm3_key][:password]
+-#    box.vm.communicator = vms[vm3_key][:communicator]
+-#    box.vm.synced_folder "vm3", "/synced", type: :nfs
+-#    box.vm.provision "shell", path: "provisioning/trivial.sh"
+-#  end
++  config.vm.define "vm3" do |box|
++    #box.vm.hostname = "vm3"
++    box.vm.provider :skytap do |box|
++      box.vm_url = vms[vm3_key][:vm_url]
++    end
++    box.ssh.username    = vms[vm3_key][:username]
++    box.ssh.password    = vms[vm3_key][:password]
++    box.vm.communicator = vms[vm3_key][:communicator]
++    #box.vm.synced_folder "vm3", "/synced", type: :nfs
++    box.vm.provision "shell", path: "provisioning/apache.sh"
++
++    box.vm.network :forwarded_port, guest: 80, host: 9000, auto_correct: true
++    box.vm.network :forwarded_port, guest: 21, host: 9001, auto_correct: true
++  end
+ end
+ 
+ #ubuntu.vm.synced_folder "vm1", "/home/skytap/app", type: :nfs, :mount_options => ['actimeo=1']