vagrant-skytap 0.1.11 → 0.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.byebug_history +242 -19
- data/CHANGELOG.md +9 -0
- data/README.md +30 -8
- data/Vagrantfile.rej +83 -0
- data/_patches-20160112/0 +388 -0
- data/_patches-20160112/1 +82 -0
- data/_patches-20160112/2 +239 -0
- data/_patches-20160112/COMPLETED-ABOVE-THIS-LINE +4 -0
- data/_patches-20160112/COMPLETED-BELOW-THIS-LINE +4 -0
- data/_patches-20160112/CR-ABOVE-THIS-LINE +4 -0
- data/_patches-20160112/CR-BELOW-THIS-LINE +4 -0
- data/_patches-20160112/WIP-ABOVE-THIS-LINE +4 -0
- data/_patches-20160112/WIP-BELOW-THIS-LINE +4 -0
- data/_patches-20160112/acceptance-test-runner +29 -0
- data/_patches-20160112/ansible-1 +92 -0
- data/_patches-20160112/cache-api-client-in-up +40 -0
- data/_patches-20160112/dead-code-in-actions +44 -0
- data/_patches-20160112/debug-changes +42 -0
- data/_patches-20160112/demo-rails-app +1276 -0
- data/_patches-20160112/eng-10166-halt-spec +40 -0
- data/_patches-20160112/eng-10256 +527 -0
- data/_patches-20160112/eng-10256-2 +162 -0
- data/_patches-20160112/eng-10256-ubuntu-testing +88 -0
- data/_patches-20160112/eng-10269-test-stuff +87 -0
- data/_patches-20160112/eng-10269-wtf +119 -0
- data/_patches-20160112/eng-10369 +143 -0
- data/_patches-20160112/eng-10369-tmp +60 -0
- data/_patches-20160112/eng-10919 +56 -0
- data/_patches-20160112/eng-11177-fix-actions-requires +44 -0
- data/_patches-20160112/eng-11442 +4 -0
- data/_patches-20160112/eng-11616 +403 -0
- data/_patches-20160112/eng-11616-2 +67 -0
- data/_patches-20160112/eng-11616-actual +184 -0
- data/_patches-20160112/eng-11625a +4 -0
- data/_patches-20160112/eng-11711 +85 -0
- data/_patches-20160112/eng-12232-command-spec +236 -0
- data/_patches-20160112/eng-12235 +83 -0
- data/_patches-20160112/eng-12235-override-refactor +140 -0
- data/_patches-20160112/eng-12240 +103 -0
- data/_patches-20160112/eng-12249 +40 -0
- data/_patches-20160112/eng-12301 +50 -0
- data/_patches-20160112/eng-12843 +95 -0
- data/_patches-20160112/env-source +112 -0
- data/_patches-20160112/frickin-vagrant-spec +163 -0
- data/_patches-20160112/gem-pre-version +14 -0
- data/_patches-20160112/gems-old +9 -0
- data/_patches-20160112/googles-specs +713 -0
- data/_patches-20160112/local-configs-ignore +61 -0
- data/_patches-20160112/misc +79 -0
- data/_patches-20160112/network-unreachable +31 -0
- data/_patches-20160112/new-boxfile +288 -0
- data/_patches-20160112/parallelization-maybe +198 -0
- data/_patches-20160112/read-state +23 -0
- data/_patches-20160112/refactor-to-use-public_address-cap +25 -0
- data/_patches-20160112/series +60 -0
- data/_patches-20160112/status +12 -0
- data/_patches-20160112/test-move-env-data +231 -0
- data/_patches-20160112/test-vagrantfile-vm1 +167 -0
- data/_patches-20160112/the_version_in_0.1.13.pre1 +598 -0
- data/_patches-20160112/vagrant-spec-mock-api +137 -0
- data/_patches-20160112/vagrant-vmware-plugin +233 -0
- data/_patches-20160112/vagrantfile +403 -0
- data/_patches-20160112/vagrantfile-for-acceptance-tests +29 -0
- data/_patches-20160112/vagrantfile-for-nick +95 -0
- data/_patches-20160112/vagrantfiles-to-forget-what-they-are-for +134 -0
- data/_patches-20160112/vm-vanished +42 -0
- data/_patches-20160112a/01 +148 -0
- data/_patches-20160112a/2 +239 -0
- data/_patches-20160112a/COMPLETED-ABOVE-THIS-LINE +4 -0
- data/_patches-20160112a/COMPLETED-BELOW-THIS-LINE +4 -0
- data/_patches-20160112a/CR-ABOVE-THIS-LINE +4 -0
- data/_patches-20160112a/CR-BELOW-THIS-LINE +4 -0
- data/_patches-20160112a/WIP-ABOVE-THIS-LINE +4 -0
- data/_patches-20160112a/WIP-BELOW-THIS-LINE +4 -0
- data/_patches-20160112a/acceptance-test-runner +29 -0
- data/_patches-20160112a/ansible-1 +92 -0
- data/_patches-20160112a/cache-api-client-in-up +40 -0
- data/_patches-20160112a/dead-code-in-actions +44 -0
- data/_patches-20160112a/debug-changes +42 -0
- data/_patches-20160112a/demo-rails-app +1276 -0
- data/_patches-20160112a/eng-10166-halt-spec +40 -0
- data/_patches-20160112a/eng-10256-ubuntu-testing +88 -0
- data/_patches-20160112a/eng-10269-test-stuff +87 -0
- data/_patches-20160112a/eng-10269-wtf +119 -0
- data/_patches-20160112a/eng-10369 +143 -0
- data/_patches-20160112a/eng-10369-tmp +60 -0
- data/_patches-20160112a/eng-10919 +56 -0
- data/_patches-20160112a/eng-11177-fix-actions-requires +44 -0
- data/_patches-20160112a/eng-11442 +4 -0
- data/_patches-20160112a/eng-11616 +403 -0
- data/_patches-20160112a/eng-11616-2 +67 -0
- data/_patches-20160112a/eng-11616-actual +184 -0
- data/_patches-20160112a/eng-11625a +4 -0
- data/_patches-20160112a/eng-11711 +85 -0
- data/_patches-20160112a/eng-12232-command-spec +236 -0
- data/_patches-20160112a/eng-12235 +83 -0
- data/_patches-20160112a/eng-12235-override-refactor +140 -0
- data/_patches-20160112a/eng-12240 +103 -0
- data/_patches-20160112a/eng-12249 +40 -0
- data/_patches-20160112a/eng-12301 +50 -0
- data/_patches-20160112a/eng-12843 +95 -0
- data/_patches-20160112a/env-source +112 -0
- data/_patches-20160112a/frickin-vagrant-spec +163 -0
- data/_patches-20160112a/gem-pre-version +14 -0
- data/_patches-20160112a/gems-old +9 -0
- data/_patches-20160112a/googles-specs +713 -0
- data/_patches-20160112a/local-configs-ignore +61 -0
- data/_patches-20160112a/misc +79 -0
- data/_patches-20160112a/network-unreachable +31 -0
- data/_patches-20160112a/new-boxfile +288 -0
- data/_patches-20160112a/parallelization-maybe +198 -0
- data/_patches-20160112a/read-state +23 -0
- data/_patches-20160112a/refactor-to-use-public_address-cap +25 -0
- data/_patches-20160112a/series +58 -0
- data/_patches-20160112a/status +14 -0
- data/_patches-20160112a/test-move-env-data +231 -0
- data/_patches-20160112a/test-vagrantfile-vm1 +167 -0
- data/_patches-20160112a/the_version_in_0.1.13.pre1 +612 -0
- data/_patches-20160112a/then-copy-the-newer-files +632 -0
- data/_patches-20160112a/vagrant-spec-mock-api +137 -0
- data/_patches-20160112a/vagrant-vmware-plugin +233 -0
- data/_patches-20160112a/vagrantfile +403 -0
- data/_patches-20160112a/vagrantfile-for-acceptance-tests +29 -0
- data/_patches-20160112a/vagrantfile-for-nick +95 -0
- data/_patches-20160112a/vagrantfiles-to-forget-what-they-are-for +134 -0
- data/_patches-20160112a/vm-vanished +42 -0
- data/_patches-20160113/COMPLETED-ABOVE-THIS-LINE +4 -0
- data/_patches-20160113/COMPLETED-BELOW-THIS-LINE +4 -0
- data/_patches-20160113/CR-ABOVE-THIS-LINE +4 -0
- data/_patches-20160113/CR-BELOW-THIS-LINE +4 -0
- data/_patches-20160113/WIP-ABOVE-THIS-LINE +4 -0
- data/_patches-20160113/WIP-BELOW-THIS-LINE +4 -0
- data/_patches-20160113/acceptance-test-runner +29 -0
- data/_patches-20160113/ansible-1 +92 -0
- data/_patches-20160113/cache-api-client-in-up +40 -0
- data/_patches-20160113/dead-code-in-actions +44 -0
- data/_patches-20160113/debug-changes +55 -0
- data/_patches-20160113/demo-rails-app +1276 -0
- data/_patches-20160113/eng-10166-halt-spec +40 -0
- data/_patches-20160113/eng-10256 +543 -0
- data/_patches-20160113/eng-10256-ubuntu-testing +88 -0
- data/_patches-20160113/eng-10269-test-stuff +87 -0
- data/_patches-20160113/eng-10269-wtf +119 -0
- data/_patches-20160113/eng-10369 +143 -0
- data/_patches-20160113/eng-10369-tmp +60 -0
- data/_patches-20160113/eng-10919 +56 -0
- data/_patches-20160113/eng-11177-fix-actions-requires +44 -0
- data/_patches-20160113/eng-11442 +4 -0
- data/_patches-20160113/eng-11616 +403 -0
- data/_patches-20160113/eng-11616-2 +67 -0
- data/_patches-20160113/eng-11616-actual +184 -0
- data/_patches-20160113/eng-11625a +4 -0
- data/_patches-20160113/eng-11711 +85 -0
- data/_patches-20160113/eng-12232-command-spec +236 -0
- data/_patches-20160113/eng-12235 +83 -0
- data/_patches-20160113/eng-12235-override-refactor +140 -0
- data/_patches-20160113/eng-12240 +103 -0
- data/_patches-20160113/eng-12249 +40 -0
- data/_patches-20160113/eng-12301 +50 -0
- data/_patches-20160113/eng-12720 +47 -0
- data/_patches-20160113/eng-12843 +95 -0
- data/_patches-20160113/env-source +112 -0
- data/_patches-20160113/frickin-vagrant-spec +163 -0
- data/_patches-20160113/gem-pre-version +14 -0
- data/_patches-20160113/gems-old +9 -0
- data/_patches-20160113/googles-specs +713 -0
- data/_patches-20160113/local-configs-ignore +61 -0
- data/_patches-20160113/misc +79 -0
- data/_patches-20160113/network-unreachable +31 -0
- data/_patches-20160113/new-boxfile +288 -0
- data/_patches-20160113/parallelization-maybe +198 -0
- data/_patches-20160113/read-state +23 -0
- data/_patches-20160113/refactor-to-use-public_address-cap +25 -0
- data/_patches-20160113/series +56 -0
- data/_patches-20160113/status +14 -0
- data/_patches-20160113/test-move-env-data +231 -0
- data/_patches-20160113/test-vagrantfile-vm1 +167 -0
- data/_patches-20160113/vagrant-spec-mock-api +137 -0
- data/_patches-20160113/vagrant-vmware-plugin +233 -0
- data/_patches-20160113/vagrantfile +403 -0
- data/_patches-20160113/vagrantfile-for-acceptance-tests +29 -0
- data/_patches-20160113/vagrantfile-for-nick +95 -0
- data/_patches-20160113/vagrantfiles-to-forget-what-they-are-for +134 -0
- data/_patches-20160113/vm-vanished +42 -0
- data/_patches-20160118/COMPLETED-ABOVE-THIS-LINE +4 -0
- data/_patches-20160118/COMPLETED-BELOW-THIS-LINE +4 -0
- data/_patches-20160118/CR-ABOVE-THIS-LINE +4 -0
- data/_patches-20160118/CR-BELOW-THIS-LINE +4 -0
- data/_patches-20160118/WIP-ABOVE-THIS-LINE +4 -0
- data/_patches-20160118/WIP-BELOW-THIS-LINE +4 -0
- data/_patches-20160118/acceptance-test-runner +29 -0
- data/_patches-20160118/ansible-1 +92 -0
- data/_patches-20160118/cache-api-client-in-up +40 -0
- data/_patches-20160118/dead-code-in-actions +44 -0
- data/_patches-20160118/debug-changes +55 -0
- data/_patches-20160118/demo-rails-app +1276 -0
- data/_patches-20160118/eng-10166-halt-spec +40 -0
- data/_patches-20160118/eng-10256 +554 -0
- data/_patches-20160118/eng-10256-cr +314 -0
- data/_patches-20160118/eng-10256-ubuntu-testing +88 -0
- data/_patches-20160118/eng-10269-test-stuff +87 -0
- data/_patches-20160118/eng-10269-wtf +119 -0
- data/_patches-20160118/eng-10369 +143 -0
- data/_patches-20160118/eng-10369-tmp +60 -0
- data/_patches-20160118/eng-10919 +56 -0
- data/_patches-20160118/eng-11177-fix-actions-requires +44 -0
- data/_patches-20160118/eng-11442 +4 -0
- data/_patches-20160118/eng-11616 +403 -0
- data/_patches-20160118/eng-11616-2 +67 -0
- data/_patches-20160118/eng-11616-actual +184 -0
- data/_patches-20160118/eng-11625a +4 -0
- data/_patches-20160118/eng-11711 +85 -0
- data/_patches-20160118/eng-12232-command-spec +236 -0
- data/_patches-20160118/eng-12235 +83 -0
- data/_patches-20160118/eng-12235-override-refactor +140 -0
- data/_patches-20160118/eng-12240 +103 -0
- data/_patches-20160118/eng-12249 +40 -0
- data/_patches-20160118/eng-12301 +50 -0
- data/_patches-20160118/eng-12720 +74 -0
- data/_patches-20160118/eng-12843 +95 -0
- data/_patches-20160118/eng-13040 +291 -0
- data/_patches-20160118/env-source +112 -0
- data/_patches-20160118/frickin-vagrant-spec +163 -0
- data/_patches-20160118/gem-pre-version +14 -0
- data/_patches-20160118/gems-old +9 -0
- data/_patches-20160118/googles-specs +713 -0
- data/_patches-20160118/local-configs-ignore +61 -0
- data/_patches-20160118/misc +79 -0
- data/_patches-20160118/network-unreachable +31 -0
- data/_patches-20160118/new-boxfile +288 -0
- data/_patches-20160118/parallelization-maybe +198 -0
- data/_patches-20160118/port-forwarding-processes +87 -0
- data/_patches-20160118/read-state +23 -0
- data/_patches-20160118/refactor-to-use-public_address-cap +25 -0
- data/_patches-20160118/series +59 -0
- data/_patches-20160118/status +13 -0
- data/_patches-20160118/test-move-env-data +231 -0
- data/_patches-20160118/test-vagrantfile-vm1 +167 -0
- data/_patches-20160118/vagrant-spec-mock-api +137 -0
- data/_patches-20160118/vagrant-vmware-plugin +233 -0
- data/_patches-20160118/vagrantfile +403 -0
- data/_patches-20160118/vagrantfile-for-acceptance-tests +29 -0
- data/_patches-20160118/vagrantfile-for-nick +95 -0
- data/_patches-20160118/vagrantfiles-to-forget-what-they-are-for +134 -0
- data/_patches-20160118/vm-vanished +42 -0
- data/_patches-20160118a/COMPLETED-ABOVE-THIS-LINE +4 -0
- data/_patches-20160118a/COMPLETED-BELOW-THIS-LINE +4 -0
- data/_patches-20160118a/CR-ABOVE-THIS-LINE +4 -0
- data/_patches-20160118a/CR-BELOW-THIS-LINE +4 -0
- data/_patches-20160118a/WIP-ABOVE-THIS-LINE +4 -0
- data/_patches-20160118a/WIP-BELOW-THIS-LINE +4 -0
- data/_patches-20160118a/acceptance-test-runner +29 -0
- data/_patches-20160118a/ansible-1 +92 -0
- data/_patches-20160118a/bar +189 -0
- data/_patches-20160118a/cache-api-client-in-up +40 -0
- data/_patches-20160118a/dead-code-in-actions +44 -0
- data/_patches-20160118a/debug-changes +55 -0
- data/_patches-20160118a/demo-rails-app +1276 -0
- data/_patches-20160118a/eng-10166-halt-spec +40 -0
- data/_patches-20160118a/eng-10256 +554 -0
- data/_patches-20160118a/eng-10256-cr +314 -0
- data/_patches-20160118a/eng-10256-ubuntu-testing +88 -0
- data/_patches-20160118a/eng-10269-test-stuff +87 -0
- data/_patches-20160118a/eng-10269-wtf +119 -0
- data/_patches-20160118a/eng-10369 +143 -0
- data/_patches-20160118a/eng-10369-tmp +60 -0
- data/_patches-20160118a/eng-10919 +56 -0
- data/_patches-20160118a/eng-11177-fix-actions-requires +44 -0
- data/_patches-20160118a/eng-11442 +4 -0
- data/_patches-20160118a/eng-11616 +403 -0
- data/_patches-20160118a/eng-11616-2 +67 -0
- data/_patches-20160118a/eng-11616-actual +184 -0
- data/_patches-20160118a/eng-11625a +4 -0
- data/_patches-20160118a/eng-11711 +85 -0
- data/_patches-20160118a/eng-12232-command-spec +236 -0
- data/_patches-20160118a/eng-12235 +83 -0
- data/_patches-20160118a/eng-12235-override-refactor +140 -0
- data/_patches-20160118a/eng-12240 +103 -0
- data/_patches-20160118a/eng-12249 +40 -0
- data/_patches-20160118a/eng-12301 +50 -0
- data/_patches-20160118a/eng-12720 +74 -0
- data/_patches-20160118a/eng-12843 +95 -0
- data/_patches-20160118a/eng-13040 +291 -0
- data/_patches-20160118a/env-source +112 -0
- data/_patches-20160118a/foo +169 -0
- data/_patches-20160118a/frickin-vagrant-spec +163 -0
- data/_patches-20160118a/gem-pre-version +14 -0
- data/_patches-20160118a/gems-old +9 -0
- data/_patches-20160118a/googles-specs +713 -0
- data/_patches-20160118a/guestport-madness +59 -0
- data/_patches-20160118a/local-configs-ignore +61 -0
- data/_patches-20160118a/misc +79 -0
- data/_patches-20160118a/network-unreachable +31 -0
- data/_patches-20160118a/new-boxfile +288 -0
- data/_patches-20160118a/parallelization-maybe +198 -0
- data/_patches-20160118a/port-forwarding-processes +87 -0
- data/_patches-20160118a/read-state +23 -0
- data/_patches-20160118a/refactor-to-use-public_address-cap +25 -0
- data/_patches-20160118a/series +62 -0
- data/_patches-20160118a/status +14 -0
- data/_patches-20160118a/test-move-env-data +231 -0
- data/_patches-20160118a/test-vagrantfile-vm1 +167 -0
- data/_patches-20160118a/vagrant-spec-mock-api +137 -0
- data/_patches-20160118a/vagrant-vmware-plugin +233 -0
- data/_patches-20160118a/vagrantfile +403 -0
- data/_patches-20160118a/vagrantfile-for-acceptance-tests +29 -0
- data/_patches-20160118a/vagrantfile-for-nick +95 -0
- data/_patches-20160118a/vagrantfiles-to-forget-what-they-are-for +134 -0
- data/_patches-20160118a/vm-vanished +42 -0
- data/lib/vagrant-skytap/action/clear_forwarded_ports.rb +19 -0
- data/lib/vagrant-skytap/action/forward_ports.rb +42 -0
- data/lib/vagrant-skytap/action/prepare_forwarded_port_collision_params.rb +37 -0
- data/lib/vagrant-skytap/action.rb +18 -0
- data/lib/vagrant-skytap/api/environment.rb +19 -4
- data/lib/vagrant-skytap/api/vm.rb +10 -6
- data/lib/vagrant-skytap/command/up.rb +7 -1
- data/lib/vagrant-skytap/errors.rb +4 -0
- data/lib/vagrant-skytap/hosts/bsd/cap/ssh_tunnel.rb +15 -0
- data/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb +183 -0
- data/lib/vagrant-skytap/hosts/linux/cap/ssh_tunnel.rb +15 -0
- data/lib/vagrant-skytap/hosts/windows/cap/ssh_tunnel.rb +27 -0
- data/lib/vagrant-skytap/model/forwarded_port.rb +78 -0
- data/lib/vagrant-skytap/plugin.rb +15 -0
- data/lib/vagrant-skytap/util/compile_forwarded_ports.rb +35 -0
- data/lib/vagrant-skytap/version.rb +1 -1
- data/locales/en.yml +3 -0
- data/spec/unit/environment_spec.rb +14 -2
- data/spec/unit/forwarded_port_spec.rb +45 -0
- data/spec/unit/hosts/common/cap/ssh_tunnel_spec.rb +180 -0
- data/spec/unit/prepare_collision_params_spec.rb +57 -0
- data/spec/unit/support/forwarded_ports/machines/vm1/skytap/id +1 -0
- data/spec/unit/support/forwarded_ports/machines/vm1/skytap/private_key +4 -0
- data/spec/unit/support/forwarded_ports/machines/vm1/skytap/tcp9000_tcp_9000_80.pid +1 -0
- data/spec/unit/support/forwarded_ports/machines/vm1/skytap/tcp9001_tcp_9001_81.pid +1 -0
- data/spec/unit/support/forwarded_ports/machines/vm1/virtualbox/id +1 -0
- data/spec/unit/support/forwarded_ports/machines/vm2/skytap/id +1 -0
- data/spec/unit/support/forwarded_ports/machines/vm2/skytap/tcp8080_tcp_8080_80.pid +1 -0
- data/spec/unit/support/forwarded_ports/machines/vm3/virtualbox/id +1 -0
- data/spec/unit/support/forwarded_ports/machines/vm4/skytap/id +1 -0
- data/spec/unit/support/forwarded_ports/machines/vm4/skytap/tcp8888_tcp_8888_80.pid +1 -0
- metadata +330 -2
@@ -0,0 +1,143 @@
|
|
1
|
+
# HG changeset patch
|
2
|
+
# Parent d55067c6de25d1b7ff712f9a8a934dc122e82e14
|
3
|
+
# Parent d55067c6de25d1b7ff712f9a8a934dc122e82e14
|
4
|
+
ENG-10369 Detect errors in 200 response.
|
5
|
+
|
6
|
+
diff -r d55067c6de25 Vagrantfile
|
7
|
+
--- a/Vagrantfile Mon Nov 09 18:52:55 2015 -0800
|
8
|
+
+++ b/Vagrantfile Tue Nov 10 15:32:33 2015 -0800
|
9
|
+
@@ -3,20 +3,20 @@
|
10
|
+
config.vm.synced_folder ".", "/vagrant", disabled: true
|
11
|
+
|
12
|
+
config.vm.provider :skytap do |skytap, override|
|
13
|
+
- skytap.username = "etrue"
|
14
|
+
- skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
|
15
|
+
- skytap.base_url = "https://cloud.skytap.com/"
|
16
|
+
- #skytap.username = "vagrant_provider_admin"
|
17
|
+
- #skytap.api_token = "7c5718531a32eb90e92c804ce1f73da98be22cdf"
|
18
|
+
- #skytap.base_url = "https://test.skytap.com/"
|
19
|
+
+# skytap.username = "etrue"
|
20
|
+
+# skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
|
21
|
+
+# skytap.base_url = "https://cloud.skytap.com/"
|
22
|
+
+ skytap.username = "vagrant_provider_admin"
|
23
|
+
+ skytap.api_token = "7c5718531a32eb90e92c804ce1f73da98be22cdf"
|
24
|
+
+ skytap.base_url = "https://test.skytap.com/"
|
25
|
+
#skytap.username = "jsmith"
|
26
|
+
#skytap.api_token = "754be5220955f35840498340606b4dfa89f7eb61"
|
27
|
+
#skytap.base_url = "https://cloud.skytap.dev/"
|
28
|
+
end
|
29
|
+
|
30
|
+
- GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
|
31
|
+
+# GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
|
32
|
+
# for test user
|
33
|
+
- #GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/4840008'
|
34
|
+
+ GENERIC_UBUNTU = 'https://test.skytap.com/vms/4840008'
|
35
|
+
# local user
|
36
|
+
#GENERIC_UBUNTU = 'https://cloud.skytap.dev/vms/374'
|
37
|
+
|
38
|
+
@@ -33,6 +33,8 @@
|
39
|
+
UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_A = "https://cloud.skytap.com/vms/7457184"
|
40
|
+
UBUNTU_STOPPED_ENVIRONMENT_SOURCE_VM_B = "https://cloud.skytap.com/vms/7468766"
|
41
|
+
|
42
|
+
+ VAGRANT_CUSTOMER_VPN = "https://cloud.skytap.com/vpns/vpn-3195669"
|
43
|
+
+
|
44
|
+
# separate template
|
45
|
+
# another ubuntu = 'https://cloud.skytap.com/vms/7242466'
|
46
|
+
WINDOWS_WINRM_CONFIGURED = 'https://cloud.skytap.com/vms/7242468'
|
47
|
+
@@ -40,12 +42,13 @@
|
48
|
+
config.vm.define "vm1" do |ubuntu|
|
49
|
+
ubuntu.vm.hostname = "vm1"
|
50
|
+
ubuntu.vm.provider :skytap do |box|
|
51
|
+
- box.vm_url = UBUNTU1#GENERIC_UBUNTU
|
52
|
+
+ box.vm_url = GENERIC_UBUNTU
|
53
|
+
#box.cpus = 1
|
54
|
+
#box.cpuspersocket = 1
|
55
|
+
#box.ram = 1024
|
56
|
+
#box.guestos = "ubuntu"
|
57
|
+
#box.vpn_url = "cloud.skytap.com/vpns/vpn-711360"
|
58
|
+
+ box.vpn_url = VAGRANT_CUSTOMER_VPN
|
59
|
+
end
|
60
|
+
ubuntu.vm.synced_folder "vm1", "/synced", type: :nfs
|
61
|
+
ubuntu.vm.communicator = :ssh
|
62
|
+
diff -r d55067c6de25 lib/vagrant-skytap/api/busyable.rb
|
63
|
+
--- a/lib/vagrant-skytap/api/busyable.rb Mon Nov 09 18:52:55 2015 -0800
|
64
|
+
+++ b/lib/vagrant-skytap/api/busyable.rb Tue Nov 10 15:32:33 2015 -0800
|
65
|
+
@@ -10,6 +10,7 @@
|
66
|
+
def update_with_retry(attrs, path=nil)
|
67
|
+
retry_while_resource_busy do
|
68
|
+
resp = api_client.put(path || url, JSON.dump(attrs))
|
69
|
+
+ raise Errors::OperationFailed, err: err if err = api_client.error_string_from_body(resp)
|
70
|
+
refresh(JSON.load(resp.body))
|
71
|
+
break
|
72
|
+
end
|
73
|
+
diff -r d55067c6de25 lib/vagrant-skytap/api/client.rb
|
74
|
+
--- a/lib/vagrant-skytap/api/client.rb Mon Nov 09 18:52:55 2015 -0800
|
75
|
+
+++ b/lib/vagrant-skytap/api/client.rb Tue Nov 10 15:32:33 2015 -0800
|
76
|
+
@@ -96,7 +96,7 @@
|
77
|
+
def error_string_from_body(resp)
|
78
|
+
resp = resp.body if resp.respond_to?(:body)
|
79
|
+
begin
|
80
|
+
- resp = JSON.load(resp)
|
81
|
+
+ resp = JSON.load(resp) unless resp.is_a?(Hash)
|
82
|
+
errors = resp['error'] || resp['errors']
|
83
|
+
errors = errors.join('; ') if errors.respond_to? :join
|
84
|
+
rescue
|
85
|
+
diff -r d55067c6de25 lib/vagrant-skytap/api/runstate_operations.rb
|
86
|
+
--- a/lib/vagrant-skytap/api/runstate_operations.rb Mon Nov 09 18:52:55 2015 -0800
|
87
|
+
+++ b/lib/vagrant-skytap/api/runstate_operations.rb Tue Nov 10 15:32:33 2015 -0800
|
88
|
+
@@ -36,12 +36,18 @@
|
89
|
+
def wait_for_runstate(expected_runstate)
|
90
|
+
expected_runstate = expected_runstate.to_s
|
91
|
+
retry_while_resource_busy do
|
92
|
+
- unless reload.busy?
|
93
|
+
+ unless reload_with_error_handling.busy?
|
94
|
+
break if runstate == expected_runstate || expected_runstate == 'ready'
|
95
|
+
end
|
96
|
+
end
|
97
|
+
end
|
98
|
+
|
99
|
+
+ def reload_with_error_handling
|
100
|
+
+ reload.tap do |ret|
|
101
|
+
+ raise Errors::OperationFailed, err: err if err = api_client.error_string_from_body(attrs)
|
102
|
+
+ end
|
103
|
+
+ end
|
104
|
+
+
|
105
|
+
def runstate
|
106
|
+
get_api_attribute('runstate')
|
107
|
+
end
|
108
|
+
diff -r d55067c6de25 lib/vagrant-skytap/api/vm.rb
|
109
|
+
--- a/lib/vagrant-skytap/api/vm.rb Mon Nov 09 18:52:55 2015 -0800
|
110
|
+
+++ b/lib/vagrant-skytap/api/vm.rb Tue Nov 10 15:32:33 2015 -0800
|
111
|
+
@@ -20,12 +20,6 @@
|
112
|
+
resp = env[:api_client].get(url)
|
113
|
+
new(JSON.load(resp.body), env[:environment], env)
|
114
|
+
end
|
115
|
+
-
|
116
|
+
- def current_vm(env)
|
117
|
+
- if (environment = env[:environment]) && (machine = env[:machine]) && machine.id
|
118
|
+
- environment.get_vm_by_id(machine.id)
|
119
|
+
- end
|
120
|
+
- end
|
121
|
+
end
|
122
|
+
|
123
|
+
def initialize(attrs, environment, env)
|
124
|
+
@@ -40,6 +34,19 @@
|
125
|
+
super
|
126
|
+
end
|
127
|
+
|
128
|
+
+ def refresh_from_environment
|
129
|
+
+ refresh(environment.get_vm_by_id(id).attrs)
|
130
|
+
+ end
|
131
|
+
+
|
132
|
+
+ def reload_with_error_handling
|
133
|
+
+ environment.reload_with_error_handling
|
134
|
+
+ refresh_from_environment.tap do |ret|
|
135
|
+
+ if err = api_client.error_string_from_body(attrs)
|
136
|
+
+ raise Errors::OperationFailed, err: err
|
137
|
+
+ end
|
138
|
+
+ end
|
139
|
+
+ end
|
140
|
+
+
|
141
|
+
def interfaces
|
142
|
+
@interfaces ||= (get_api_attribute('interfaces') || []).collect do |iface_attrs|
|
143
|
+
Interface.new(iface_attrs, self, env)
|
@@ -0,0 +1,60 @@
|
|
1
|
+
# HG changeset patch
|
2
|
+
# Parent d5f0a5fe77ec4a2935c018a0687deddad1a951c7
|
3
|
+
diff -r d5f0a5fe77ec -r c9b0b1d64a0a lib/vagrant-skytap/api/client.rb
|
4
|
+
--- a/lib/vagrant-skytap/api/client.rb Mon Nov 09 19:28:06 2015 -0800
|
5
|
+
+++ b/lib/vagrant-skytap/api/client.rb Mon Nov 09 19:46:14 2015 -0800
|
6
|
+
@@ -67,11 +67,7 @@
|
7
|
+
tries += 1
|
8
|
+
http.send_request(method, URI.encode(path), body, headers).tap do |ret|
|
9
|
+
@logger.debug("REST API response: #{ret.body}")
|
10
|
+
- if ret.code =~ /^2\d\d/
|
11
|
+
- if options[:raise_on_error_field] && err = error_string_from_body(ret)
|
12
|
+
- raise Errors::OperationSucceededWithErrors, err: err
|
13
|
+
- end
|
14
|
+
- else
|
15
|
+
+ unless ret.code =~ /^2\d\d/
|
16
|
+
raise Errors::DoesNotExist, object_name: "Object '#{path}'" if ret.code == '404'
|
17
|
+
error_class = case ret.code
|
18
|
+
when '403'
|
19
|
+
diff -r d5f0a5fe77ec -r c9b0b1d64a0a lib/vagrant-skytap/api/resource.rb
|
20
|
+
--- a/lib/vagrant-skytap/api/resource.rb Mon Nov 09 19:28:06 2015 -0800
|
21
|
+
+++ b/lib/vagrant-skytap/api/resource.rb Mon Nov 09 19:46:14 2015 -0800
|
22
|
+
@@ -23,8 +23,8 @@
|
23
|
+
"/#{self.class.resource_name.downcase}s/#{id}"
|
24
|
+
end
|
25
|
+
|
26
|
+
- def reload(options={})
|
27
|
+
- resp = api_client.get(url, options)
|
28
|
+
+ def reload
|
29
|
+
+ resp = api_client.get(url)
|
30
|
+
refresh(JSON.load(resp.body))
|
31
|
+
end
|
32
|
+
|
33
|
+
@@ -33,6 +33,14 @@
|
34
|
+
self
|
35
|
+
end
|
36
|
+
|
37
|
+
+ def error?
|
38
|
+
+ error.present?
|
39
|
+
+ end
|
40
|
+
+
|
41
|
+
+ def error
|
42
|
+
+ api_client.error_string_from_body(attrs)
|
43
|
+
+ end
|
44
|
+
+
|
45
|
+
private
|
46
|
+
|
47
|
+
def api_client
|
48
|
+
diff -r d5f0a5fe77ec -r c9b0b1d64a0a lib/vagrant-skytap/api/runstate_operations.rb
|
49
|
+
--- a/lib/vagrant-skytap/api/runstate_operations.rb Mon Nov 09 19:28:06 2015 -0800
|
50
|
+
+++ b/lib/vagrant-skytap/api/runstate_operations.rb Mon Nov 09 19:46:14 2015 -0800
|
51
|
+
@@ -43,7 +43,8 @@
|
52
|
+
end
|
53
|
+
|
54
|
+
def reload_with_error_handling
|
55
|
+
- reload(raise_on_error_field: true)
|
56
|
+
+ reload
|
57
|
+
+ raise Errors::OperationSucceededWithErrors, err: error if error
|
58
|
+
end
|
59
|
+
|
60
|
+
def runstate
|
@@ -0,0 +1,56 @@
|
|
1
|
+
# HG changeset patch
|
2
|
+
# Parent 5e38cb4ec26e32e78ff52c68649daacdcafb0b3d
|
3
|
+
ENG-10919 handle SIGINT in api_client
|
4
|
+
|
5
|
+
diff -r 5e38cb4ec26e lib/vagrant-skytap/action/initialize_api_client.rb
|
6
|
+
--- a/lib/vagrant-skytap/action/initialize_api_client.rb Tue Oct 20 12:34:52 2015 -0700
|
7
|
+
+++ b/lib/vagrant-skytap/action/initialize_api_client.rb Tue Oct 20 12:35:29 2015 -0700
|
8
|
+
@@ -17,7 +17,7 @@
|
9
|
+
def call(env)
|
10
|
+
@logger.info("Connecting to Skytap...")
|
11
|
+
|
12
|
+
- client = API::Client.new(env[:machine].provider_config)
|
13
|
+
+ client = API::Client.new(env[:machine].provider_config, env)
|
14
|
+
if client.get('/configurations').code == '200'
|
15
|
+
env[:api_client] = client
|
16
|
+
end
|
17
|
+
diff -r 5e38cb4ec26e lib/vagrant-skytap/api/busyable.rb
|
18
|
+
--- a/lib/vagrant-skytap/api/busyable.rb Tue Oct 20 12:34:52 2015 -0700
|
19
|
+
+++ b/lib/vagrant-skytap/api/busyable.rb Tue Oct 20 12:35:29 2015 -0700
|
20
|
+
@@ -19,7 +19,7 @@
|
21
|
+
begin
|
22
|
+
Timeout.timeout(timeout) do
|
23
|
+
loop do
|
24
|
+
- break if env[:interrupted] # is this right?
|
25
|
+
+ break if env[:interrupted]
|
26
|
+
begin
|
27
|
+
yield
|
28
|
+
rescue Errors::ResourceBusy
|
29
|
+
diff -r 5e38cb4ec26e lib/vagrant-skytap/api/client.rb
|
30
|
+
--- a/lib/vagrant-skytap/api/client.rb Tue Oct 20 12:34:52 2015 -0700
|
31
|
+
+++ b/lib/vagrant-skytap/api/client.rb Tue Oct 20 12:35:29 2015 -0700
|
32
|
+
@@ -4,13 +4,14 @@
|
33
|
+
module Skytap
|
34
|
+
module API
|
35
|
+
class Client
|
36
|
+
- attr_reader :config, :http
|
37
|
+
+ attr_reader :config, :http, :env
|
38
|
+
|
39
|
+
MAX_RATE_LIMIT_RETRIES = 3
|
40
|
+
DEFAULT_RETRY_AFTER_SECONDS = 10
|
41
|
+
|
42
|
+
- def initialize(config)
|
43
|
+
+ def initialize(config, env)
|
44
|
+
@logger = Log4r::Logger.new("vagrant_skytap::api_client")
|
45
|
+
+ @env = env
|
46
|
+
|
47
|
+
@config = config
|
48
|
+
uri = URI.parse(config.base_url)
|
49
|
+
@@ -65,6 +66,7 @@
|
50
|
+
retry_after = DEFAULT_RETRY_AFTER_SECONDS
|
51
|
+
begin
|
52
|
+
tries += 1
|
53
|
+
+ break if env[:interrupted]
|
54
|
+
http.send_request(method, URI.encode(path), body, headers).tap do |ret|
|
55
|
+
unless ret.code =~ /^2\d\d/
|
56
|
+
raise Errors::DoesNotExist, object_name: "Object '#{path}'" if ret.code == '404'
|
@@ -0,0 +1,44 @@
|
|
1
|
+
# HG changeset patch
|
2
|
+
# Parent 31f40af2f5bd2a0dd1fbb21d3f00e34333866824
|
3
|
+
ENG-11177 fix 'require's
|
4
|
+
|
5
|
+
diff -r 31f40af2f5bd lib/vagrant-skytap/action/add_vm_to_environment.rb
|
6
|
+
--- a/lib/vagrant-skytap/action/add_vm_to_environment.rb Tue Oct 20 13:54:33 2015 -0700
|
7
|
+
+++ b/lib/vagrant-skytap/action/add_vm_to_environment.rb Tue Oct 20 13:56:31 2015 -0700
|
8
|
+
@@ -1,7 +1,4 @@
|
9
|
+
require 'log4r'
|
10
|
+
-require 'json'
|
11
|
+
-require 'vagrant-skytap/setup_helper'
|
12
|
+
-
|
13
|
+
|
14
|
+
module VagrantPlugins
|
15
|
+
module Skytap
|
16
|
+
diff -r 31f40af2f5bd lib/vagrant-skytap/action/create_environment.rb
|
17
|
+
--- a/lib/vagrant-skytap/action/create_environment.rb Tue Oct 20 13:54:33 2015 -0700
|
18
|
+
+++ b/lib/vagrant-skytap/action/create_environment.rb Tue Oct 20 13:56:31 2015 -0700
|
19
|
+
@@ -1,16 +1,7 @@
|
20
|
+
require 'log4r'
|
21
|
+
-require 'json'
|
22
|
+
-
|
23
|
+
-require 'vagrant-skytap/setup_helper'
|
24
|
+
require 'vagrant-skytap/util/timer'
|
25
|
+
require 'vagrant-skytap/api/environment'
|
26
|
+
|
27
|
+
-require 'net/https'
|
28
|
+
-require 'uri'
|
29
|
+
-require 'base64'
|
30
|
+
-require 'json'
|
31
|
+
-require 'timeout'
|
32
|
+
-
|
33
|
+
module VagrantPlugins
|
34
|
+
module Skytap
|
35
|
+
module Action
|
36
|
+
diff -r 31f40af2f5bd lib/vagrant-skytap/action/delete_environment.rb
|
37
|
+
--- a/lib/vagrant-skytap/action/delete_environment.rb Tue Oct 20 13:54:33 2015 -0700
|
38
|
+
+++ b/lib/vagrant-skytap/action/delete_environment.rb Tue Oct 20 13:56:31 2015 -0700
|
39
|
+
@@ -1,3 +1,5 @@
|
40
|
+
+require 'log4r'
|
41
|
+
+
|
42
|
+
module VagrantPlugins
|
43
|
+
module Skytap
|
44
|
+
module Action
|