vagrant-skytap 0.2.2 → 0.2.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/lib/vagrant-skytap/action/add_vm_to_environment.rb +4 -4
- data/lib/vagrant-skytap/action/compose_environment.rb +131 -0
- data/lib/vagrant-skytap/action/create_environment.rb +3 -1
- data/lib/vagrant-skytap/action/initialize_api_client.rb +6 -5
- data/lib/vagrant-skytap/action/set_up_vm.rb +3 -1
- data/lib/vagrant-skytap/action/store_extra_data.rb +4 -2
- data/lib/vagrant-skytap/action.rb +4 -17
- data/lib/vagrant-skytap/api/environment.rb +53 -25
- data/lib/vagrant-skytap/api/vm.rb +9 -3
- data/lib/vagrant-skytap/command/up.rb +46 -30
- data/lib/vagrant-skytap/errors.rb +4 -0
- data/lib/vagrant-skytap/version.rb +1 -1
- data/locales/en.yml +5 -1
- data/spec/unit/actions/compose_environment_spec.rb +101 -0
- data/spec/unit/environment_spec.rb +26 -45
- data/spec/unit/support/shared/skytap_context.rb +5 -0
- data/vagrant-skytap.gemspec +3 -3
- metadata +9 -311
- data/.byebug_history +0 -256
- data/.project +0 -11
- data/_patches-20160112/0 +0 -388
- data/_patches-20160112/1 +0 -82
- data/_patches-20160112/2 +0 -239
- data/_patches-20160112/COMPLETED-ABOVE-THIS-LINE +0 -4
- data/_patches-20160112/COMPLETED-BELOW-THIS-LINE +0 -4
- data/_patches-20160112/CR-ABOVE-THIS-LINE +0 -4
- data/_patches-20160112/CR-BELOW-THIS-LINE +0 -4
- data/_patches-20160112/WIP-ABOVE-THIS-LINE +0 -4
- data/_patches-20160112/WIP-BELOW-THIS-LINE +0 -4
- data/_patches-20160112/acceptance-test-runner +0 -29
- data/_patches-20160112/ansible-1 +0 -92
- data/_patches-20160112/cache-api-client-in-up +0 -40
- data/_patches-20160112/dead-code-in-actions +0 -44
- data/_patches-20160112/debug-changes +0 -42
- data/_patches-20160112/demo-rails-app +0 -1276
- data/_patches-20160112/eng-10166-halt-spec +0 -40
- data/_patches-20160112/eng-10256 +0 -527
- data/_patches-20160112/eng-10256-2 +0 -162
- data/_patches-20160112/eng-10256-ubuntu-testing +0 -88
- data/_patches-20160112/eng-10269-test-stuff +0 -87
- data/_patches-20160112/eng-10269-wtf +0 -119
- data/_patches-20160112/eng-10369 +0 -143
- data/_patches-20160112/eng-10369-tmp +0 -60
- data/_patches-20160112/eng-10919 +0 -56
- data/_patches-20160112/eng-11177-fix-actions-requires +0 -44
- data/_patches-20160112/eng-11442 +0 -4
- data/_patches-20160112/eng-11616 +0 -403
- data/_patches-20160112/eng-11616-2 +0 -67
- data/_patches-20160112/eng-11616-actual +0 -184
- data/_patches-20160112/eng-11625a +0 -4
- data/_patches-20160112/eng-11711 +0 -85
- data/_patches-20160112/eng-12232-command-spec +0 -236
- data/_patches-20160112/eng-12235 +0 -83
- data/_patches-20160112/eng-12235-override-refactor +0 -140
- data/_patches-20160112/eng-12240 +0 -103
- data/_patches-20160112/eng-12249 +0 -40
- data/_patches-20160112/eng-12301 +0 -50
- data/_patches-20160112/eng-12843 +0 -95
- data/_patches-20160112/env-source +0 -112
- data/_patches-20160112/frickin-vagrant-spec +0 -163
- data/_patches-20160112/gem-pre-version +0 -14
- data/_patches-20160112/gems-old +0 -9
- data/_patches-20160112/googles-specs +0 -713
- data/_patches-20160112/local-configs-ignore +0 -61
- data/_patches-20160112/misc +0 -79
- data/_patches-20160112/network-unreachable +0 -31
- data/_patches-20160112/new-boxfile +0 -288
- data/_patches-20160112/parallelization-maybe +0 -198
- data/_patches-20160112/read-state +0 -23
- data/_patches-20160112/refactor-to-use-public_address-cap +0 -25
- data/_patches-20160112/series +0 -60
- data/_patches-20160112/status +0 -12
- data/_patches-20160112/test-move-env-data +0 -231
- data/_patches-20160112/test-vagrantfile-vm1 +0 -167
- data/_patches-20160112/the_version_in_0.1.13.pre1 +0 -598
- data/_patches-20160112/vagrant-spec-mock-api +0 -137
- data/_patches-20160112/vagrant-vmware-plugin +0 -233
- data/_patches-20160112/vagrantfile +0 -403
- data/_patches-20160112/vagrantfile-for-acceptance-tests +0 -29
- data/_patches-20160112/vagrantfile-for-nick +0 -95
- data/_patches-20160112/vagrantfiles-to-forget-what-they-are-for +0 -134
- data/_patches-20160112/vm-vanished +0 -42
- data/_patches-20160112a/01 +0 -148
- data/_patches-20160112a/2 +0 -239
- data/_patches-20160112a/COMPLETED-ABOVE-THIS-LINE +0 -4
- data/_patches-20160112a/COMPLETED-BELOW-THIS-LINE +0 -4
- data/_patches-20160112a/CR-ABOVE-THIS-LINE +0 -4
- data/_patches-20160112a/CR-BELOW-THIS-LINE +0 -4
- data/_patches-20160112a/WIP-ABOVE-THIS-LINE +0 -4
- data/_patches-20160112a/WIP-BELOW-THIS-LINE +0 -4
- data/_patches-20160112a/acceptance-test-runner +0 -29
- data/_patches-20160112a/ansible-1 +0 -92
- data/_patches-20160112a/cache-api-client-in-up +0 -40
- data/_patches-20160112a/dead-code-in-actions +0 -44
- data/_patches-20160112a/debug-changes +0 -42
- data/_patches-20160112a/demo-rails-app +0 -1276
- data/_patches-20160112a/eng-10166-halt-spec +0 -40
- data/_patches-20160112a/eng-10256-ubuntu-testing +0 -88
- data/_patches-20160112a/eng-10269-test-stuff +0 -87
- data/_patches-20160112a/eng-10269-wtf +0 -119
- data/_patches-20160112a/eng-10369 +0 -143
- data/_patches-20160112a/eng-10369-tmp +0 -60
- data/_patches-20160112a/eng-10919 +0 -56
- data/_patches-20160112a/eng-11177-fix-actions-requires +0 -44
- data/_patches-20160112a/eng-11442 +0 -4
- data/_patches-20160112a/eng-11616 +0 -403
- data/_patches-20160112a/eng-11616-2 +0 -67
- data/_patches-20160112a/eng-11616-actual +0 -184
- data/_patches-20160112a/eng-11625a +0 -4
- data/_patches-20160112a/eng-11711 +0 -85
- data/_patches-20160112a/eng-12232-command-spec +0 -236
- data/_patches-20160112a/eng-12235 +0 -83
- data/_patches-20160112a/eng-12235-override-refactor +0 -140
- data/_patches-20160112a/eng-12240 +0 -103
- data/_patches-20160112a/eng-12249 +0 -40
- data/_patches-20160112a/eng-12301 +0 -50
- data/_patches-20160112a/eng-12843 +0 -95
- data/_patches-20160112a/env-source +0 -112
- data/_patches-20160112a/frickin-vagrant-spec +0 -163
- data/_patches-20160112a/gem-pre-version +0 -14
- data/_patches-20160112a/gems-old +0 -9
- data/_patches-20160112a/googles-specs +0 -713
- data/_patches-20160112a/local-configs-ignore +0 -61
- data/_patches-20160112a/misc +0 -79
- data/_patches-20160112a/network-unreachable +0 -31
- data/_patches-20160112a/new-boxfile +0 -288
- data/_patches-20160112a/parallelization-maybe +0 -198
- data/_patches-20160112a/read-state +0 -23
- data/_patches-20160112a/refactor-to-use-public_address-cap +0 -25
- data/_patches-20160112a/series +0 -58
- data/_patches-20160112a/status +0 -14
- data/_patches-20160112a/test-move-env-data +0 -231
- data/_patches-20160112a/test-vagrantfile-vm1 +0 -167
- data/_patches-20160112a/the_version_in_0.1.13.pre1 +0 -612
- data/_patches-20160112a/then-copy-the-newer-files +0 -632
- data/_patches-20160112a/vagrant-spec-mock-api +0 -137
- data/_patches-20160112a/vagrant-vmware-plugin +0 -233
- data/_patches-20160112a/vagrantfile +0 -403
- data/_patches-20160112a/vagrantfile-for-acceptance-tests +0 -29
- data/_patches-20160112a/vagrantfile-for-nick +0 -95
- data/_patches-20160112a/vagrantfiles-to-forget-what-they-are-for +0 -134
- data/_patches-20160112a/vm-vanished +0 -42
- data/_patches-20160113/COMPLETED-ABOVE-THIS-LINE +0 -4
- data/_patches-20160113/COMPLETED-BELOW-THIS-LINE +0 -4
- data/_patches-20160113/CR-ABOVE-THIS-LINE +0 -4
- data/_patches-20160113/CR-BELOW-THIS-LINE +0 -4
- data/_patches-20160113/WIP-ABOVE-THIS-LINE +0 -4
- data/_patches-20160113/WIP-BELOW-THIS-LINE +0 -4
- data/_patches-20160113/acceptance-test-runner +0 -29
- data/_patches-20160113/ansible-1 +0 -92
- data/_patches-20160113/cache-api-client-in-up +0 -40
- data/_patches-20160113/dead-code-in-actions +0 -44
- data/_patches-20160113/debug-changes +0 -55
- data/_patches-20160113/demo-rails-app +0 -1276
- data/_patches-20160113/eng-10166-halt-spec +0 -40
- data/_patches-20160113/eng-10256 +0 -543
- data/_patches-20160113/eng-10256-ubuntu-testing +0 -88
- data/_patches-20160113/eng-10269-test-stuff +0 -87
- data/_patches-20160113/eng-10269-wtf +0 -119
- data/_patches-20160113/eng-10369 +0 -143
- data/_patches-20160113/eng-10369-tmp +0 -60
- data/_patches-20160113/eng-10919 +0 -56
- data/_patches-20160113/eng-11177-fix-actions-requires +0 -44
- data/_patches-20160113/eng-11442 +0 -4
- data/_patches-20160113/eng-11616 +0 -403
- data/_patches-20160113/eng-11616-2 +0 -67
- data/_patches-20160113/eng-11616-actual +0 -184
- data/_patches-20160113/eng-11625a +0 -4
- data/_patches-20160113/eng-11711 +0 -85
- data/_patches-20160113/eng-12232-command-spec +0 -236
- data/_patches-20160113/eng-12235 +0 -83
- data/_patches-20160113/eng-12235-override-refactor +0 -140
- data/_patches-20160113/eng-12240 +0 -103
- data/_patches-20160113/eng-12249 +0 -40
- data/_patches-20160113/eng-12301 +0 -50
- data/_patches-20160113/eng-12720 +0 -47
- data/_patches-20160113/eng-12843 +0 -95
- data/_patches-20160113/env-source +0 -112
- data/_patches-20160113/frickin-vagrant-spec +0 -163
- data/_patches-20160113/gem-pre-version +0 -14
- data/_patches-20160113/gems-old +0 -9
- data/_patches-20160113/googles-specs +0 -713
- data/_patches-20160113/local-configs-ignore +0 -61
- data/_patches-20160113/misc +0 -79
- data/_patches-20160113/network-unreachable +0 -31
- data/_patches-20160113/new-boxfile +0 -288
- data/_patches-20160113/parallelization-maybe +0 -198
- data/_patches-20160113/read-state +0 -23
- data/_patches-20160113/refactor-to-use-public_address-cap +0 -25
- data/_patches-20160113/series +0 -56
- data/_patches-20160113/status +0 -14
- data/_patches-20160113/test-move-env-data +0 -231
- data/_patches-20160113/test-vagrantfile-vm1 +0 -167
- data/_patches-20160113/vagrant-spec-mock-api +0 -137
- data/_patches-20160113/vagrant-vmware-plugin +0 -233
- data/_patches-20160113/vagrantfile +0 -403
- data/_patches-20160113/vagrantfile-for-acceptance-tests +0 -29
- data/_patches-20160113/vagrantfile-for-nick +0 -95
- data/_patches-20160113/vagrantfiles-to-forget-what-they-are-for +0 -134
- data/_patches-20160113/vm-vanished +0 -42
- data/_patches-20160118/COMPLETED-ABOVE-THIS-LINE +0 -4
- data/_patches-20160118/COMPLETED-BELOW-THIS-LINE +0 -4
- data/_patches-20160118/CR-ABOVE-THIS-LINE +0 -4
- data/_patches-20160118/CR-BELOW-THIS-LINE +0 -4
- data/_patches-20160118/WIP-ABOVE-THIS-LINE +0 -4
- data/_patches-20160118/WIP-BELOW-THIS-LINE +0 -4
- data/_patches-20160118/acceptance-test-runner +0 -29
- data/_patches-20160118/ansible-1 +0 -92
- data/_patches-20160118/cache-api-client-in-up +0 -40
- data/_patches-20160118/dead-code-in-actions +0 -44
- data/_patches-20160118/debug-changes +0 -55
- data/_patches-20160118/demo-rails-app +0 -1276
- data/_patches-20160118/eng-10166-halt-spec +0 -40
- data/_patches-20160118/eng-10256 +0 -554
- data/_patches-20160118/eng-10256-cr +0 -314
- data/_patches-20160118/eng-10256-ubuntu-testing +0 -88
- data/_patches-20160118/eng-10269-test-stuff +0 -87
- data/_patches-20160118/eng-10269-wtf +0 -119
- data/_patches-20160118/eng-10369 +0 -143
- data/_patches-20160118/eng-10369-tmp +0 -60
- data/_patches-20160118/eng-10919 +0 -56
- data/_patches-20160118/eng-11177-fix-actions-requires +0 -44
- data/_patches-20160118/eng-11442 +0 -4
- data/_patches-20160118/eng-11616 +0 -403
- data/_patches-20160118/eng-11616-2 +0 -67
- data/_patches-20160118/eng-11616-actual +0 -184
- data/_patches-20160118/eng-11625a +0 -4
- data/_patches-20160118/eng-11711 +0 -85
- data/_patches-20160118/eng-12232-command-spec +0 -236
- data/_patches-20160118/eng-12235 +0 -83
- data/_patches-20160118/eng-12235-override-refactor +0 -140
- data/_patches-20160118/eng-12240 +0 -103
- data/_patches-20160118/eng-12249 +0 -40
- data/_patches-20160118/eng-12301 +0 -50
- data/_patches-20160118/eng-12720 +0 -74
- data/_patches-20160118/eng-12843 +0 -95
- data/_patches-20160118/eng-13040 +0 -291
- data/_patches-20160118/env-source +0 -112
- data/_patches-20160118/frickin-vagrant-spec +0 -163
- data/_patches-20160118/gem-pre-version +0 -14
- data/_patches-20160118/gems-old +0 -9
- data/_patches-20160118/googles-specs +0 -713
- data/_patches-20160118/local-configs-ignore +0 -61
- data/_patches-20160118/misc +0 -79
- data/_patches-20160118/network-unreachable +0 -31
- data/_patches-20160118/new-boxfile +0 -288
- data/_patches-20160118/parallelization-maybe +0 -198
- data/_patches-20160118/port-forwarding-processes +0 -87
- data/_patches-20160118/read-state +0 -23
- data/_patches-20160118/refactor-to-use-public_address-cap +0 -25
- data/_patches-20160118/series +0 -59
- data/_patches-20160118/status +0 -13
- data/_patches-20160118/test-move-env-data +0 -231
- data/_patches-20160118/test-vagrantfile-vm1 +0 -167
- data/_patches-20160118/vagrant-spec-mock-api +0 -137
- data/_patches-20160118/vagrant-vmware-plugin +0 -233
- data/_patches-20160118/vagrantfile +0 -403
- data/_patches-20160118/vagrantfile-for-acceptance-tests +0 -29
- data/_patches-20160118/vagrantfile-for-nick +0 -95
- data/_patches-20160118/vagrantfiles-to-forget-what-they-are-for +0 -134
- data/_patches-20160118/vm-vanished +0 -42
- data/_patches-20160118a/COMPLETED-ABOVE-THIS-LINE +0 -4
- data/_patches-20160118a/COMPLETED-BELOW-THIS-LINE +0 -4
- data/_patches-20160118a/CR-ABOVE-THIS-LINE +0 -4
- data/_patches-20160118a/CR-BELOW-THIS-LINE +0 -4
- data/_patches-20160118a/WIP-ABOVE-THIS-LINE +0 -4
- data/_patches-20160118a/WIP-BELOW-THIS-LINE +0 -4
- data/_patches-20160118a/acceptance-test-runner +0 -29
- data/_patches-20160118a/ansible-1 +0 -92
- data/_patches-20160118a/bar +0 -189
- data/_patches-20160118a/cache-api-client-in-up +0 -40
- data/_patches-20160118a/dead-code-in-actions +0 -44
- data/_patches-20160118a/debug-changes +0 -55
- data/_patches-20160118a/demo-rails-app +0 -1276
- data/_patches-20160118a/eng-10166-halt-spec +0 -40
- data/_patches-20160118a/eng-10256 +0 -554
- data/_patches-20160118a/eng-10256-cr +0 -314
- data/_patches-20160118a/eng-10256-ubuntu-testing +0 -88
- data/_patches-20160118a/eng-10269-test-stuff +0 -87
- data/_patches-20160118a/eng-10269-wtf +0 -119
- data/_patches-20160118a/eng-10369 +0 -143
- data/_patches-20160118a/eng-10369-tmp +0 -60
- data/_patches-20160118a/eng-10919 +0 -56
- data/_patches-20160118a/eng-11177-fix-actions-requires +0 -44
- data/_patches-20160118a/eng-11442 +0 -4
- data/_patches-20160118a/eng-11616 +0 -403
- data/_patches-20160118a/eng-11616-2 +0 -67
- data/_patches-20160118a/eng-11616-actual +0 -184
- data/_patches-20160118a/eng-11625a +0 -4
- data/_patches-20160118a/eng-11711 +0 -85
- data/_patches-20160118a/eng-12232-command-spec +0 -236
- data/_patches-20160118a/eng-12235 +0 -83
- data/_patches-20160118a/eng-12235-override-refactor +0 -140
- data/_patches-20160118a/eng-12240 +0 -103
- data/_patches-20160118a/eng-12249 +0 -40
- data/_patches-20160118a/eng-12301 +0 -50
- data/_patches-20160118a/eng-12720 +0 -74
- data/_patches-20160118a/eng-12843 +0 -95
- data/_patches-20160118a/eng-13040 +0 -291
- data/_patches-20160118a/env-source +0 -112
- data/_patches-20160118a/foo +0 -169
- data/_patches-20160118a/frickin-vagrant-spec +0 -163
- data/_patches-20160118a/gem-pre-version +0 -14
- data/_patches-20160118a/gems-old +0 -9
- data/_patches-20160118a/googles-specs +0 -713
- data/_patches-20160118a/guestport-madness +0 -59
- data/_patches-20160118a/local-configs-ignore +0 -61
- data/_patches-20160118a/misc +0 -79
- data/_patches-20160118a/network-unreachable +0 -31
- data/_patches-20160118a/new-boxfile +0 -288
- data/_patches-20160118a/parallelization-maybe +0 -198
- data/_patches-20160118a/port-forwarding-processes +0 -87
- data/_patches-20160118a/read-state +0 -23
- data/_patches-20160118a/refactor-to-use-public_address-cap +0 -25
- data/_patches-20160118a/series +0 -62
- data/_patches-20160118a/status +0 -14
- data/_patches-20160118a/test-move-env-data +0 -231
- data/_patches-20160118a/test-vagrantfile-vm1 +0 -167
- data/_patches-20160118a/vagrant-spec-mock-api +0 -137
- data/_patches-20160118a/vagrant-vmware-plugin +0 -233
- data/_patches-20160118a/vagrantfile +0 -403
- data/_patches-20160118a/vagrantfile-for-acceptance-tests +0 -29
- data/_patches-20160118a/vagrantfile-for-nick +0 -95
- data/_patches-20160118a/vagrantfiles-to-forget-what-they-are-for +0 -134
- data/_patches-20160118a/vm-vanished +0 -42
@@ -1,42 +0,0 @@
|
|
1
|
-
# HG changeset patch
|
2
|
-
# Parent 1b8860f8b5129c2ab846c4464378c7a582ac0a90
|
3
|
-
raise error on vm reload if it's gone?
|
4
|
-
|
5
|
-
diff -r 1b8860f8b512 lib/vagrant-skytap/api/vm.rb
|
6
|
-
--- a/lib/vagrant-skytap/api/vm.rb Mon Nov 09 20:51:32 2015 -0800
|
7
|
-
+++ b/lib/vagrant-skytap/api/vm.rb Mon Nov 09 20:52:02 2015 -0800
|
8
|
-
@@ -35,6 +35,7 @@
|
9
|
-
end
|
10
|
-
|
11
|
-
def refresh_from_environment
|
12
|
-
+ raise VmVanished, name: machine.name unless vm = environment.get_vm_by_id(id)
|
13
|
-
refresh(vm.attrs)
|
14
|
-
end
|
15
|
-
|
16
|
-
diff -r 1b8860f8b512 lib/vagrant-skytap/errors.rb
|
17
|
-
--- a/lib/vagrant-skytap/errors.rb Mon Nov 09 20:51:32 2015 -0800
|
18
|
-
+++ b/lib/vagrant-skytap/errors.rb Mon Nov 09 20:52:02 2015 -0800
|
19
|
-
@@ -27,6 +27,10 @@
|
20
|
-
error_key(:does_not_exist)
|
21
|
-
end
|
22
|
-
|
23
|
-
+ class VmVanished < VagrantSkytapError
|
24
|
-
+ error_key(:vm_vanished)
|
25
|
-
+ end
|
26
|
-
+
|
27
|
-
class BadVmUrl < VagrantSkytapError
|
28
|
-
error_key(:bad_vm_url)
|
29
|
-
end
|
30
|
-
diff -r 1b8860f8b512 locales/en.yml
|
31
|
-
--- a/locales/en.yml Mon Nov 09 20:51:32 2015 -0800
|
32
|
-
+++ b/locales/en.yml Mon Nov 09 20:52:02 2015 -0800
|
33
|
-
@@ -76,6 +76,9 @@
|
34
|
-
does_not_exist: |-
|
35
|
-
%{object_name} was not found.
|
36
|
-
|
37
|
-
+ vm_vanished: |-
|
38
|
-
+ The VM '%{name}' no longer exists on Skytap.
|
39
|
-
+
|
40
|
-
operation_failed: |-
|
41
|
-
The operation failed: %{err}
|
42
|
-
|
@@ -1,29 +0,0 @@
|
|
1
|
-
# HG changeset patch
|
2
|
-
# Parent e03c705cadffcf6ca578330597f15624260a9d46
|
3
|
-
script to run acceptance tests
|
4
|
-
|
5
|
-
diff --git a/acceptance.sh b/acceptance.sh
|
6
|
-
new file mode 100755
|
7
|
-
--- /dev/null
|
8
|
-
+++ b/acceptance.sh
|
9
|
-
@@ -0,0 +1,20 @@
|
10
|
-
+#!/bin/bash
|
11
|
-
+
|
12
|
-
+VAGRANT_LOG=info \
|
13
|
-
+VAGRANT_SKYTAP_USERNAME=etrue \
|
14
|
-
+VAGRANT_SKYTAP_API_TOKEN=fcb2620b72efddbc8239e25db9d812f510c7e166 \
|
15
|
-
+ rake acceptance:run \
|
16
|
-
+ COMPONENTS=provider/skytap/up
|
17
|
-
+
|
18
|
-
+#VAGRANT_SKYTAP_USERNAME=vagrant_provider_admin \
|
19
|
-
+#VAGRANT_SKYTAP_API_TOKEN=7c5718531a32eb90e92c804ce1f73da98be22cdf \
|
20
|
-
+#VAGRANT_SKYTAP_BASE_URL=https://test.skytap.com/ \
|
21
|
-
+
|
22
|
-
+
|
23
|
-
+
|
24
|
-
+#vagrant-spec test --config=vagrant-spec.config.rb --components="$COMPONENTS"
|
25
|
-
+
|
26
|
-
+
|
27
|
-
+# How do I get log output??
|
28
|
-
+# This needs to run in vagrant-spec, not just rake. Boxes have
|
29
|
-
+# to install.
|
data/_patches-20160113/ansible-1
DELETED
@@ -1,92 +0,0 @@
|
|
1
|
-
# HG changeset patch
|
2
|
-
# Parent 0bb10bac847b6ff55e16bc18e9e9e98b49f58444
|
3
|
-
try to get sbrady's ansible provisioning (codename: "chuck") to work
|
4
|
-
|
5
|
-
diff --git a/Vagrantfile.chuck b/Vagrantfile.chuck
|
6
|
-
new file mode 100644
|
7
|
-
--- /dev/null
|
8
|
-
+++ b/Vagrantfile.chuck
|
9
|
-
@@ -0,0 +1,55 @@
|
10
|
-
+# -*- mode: ruby -*-
|
11
|
-
+# vi: set ft=ruby :
|
12
|
-
+
|
13
|
-
+VM_CPU = 4 # Cores
|
14
|
-
+VM_RAM = 4096 # GB
|
15
|
-
+GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
|
16
|
-
+
|
17
|
-
+Vagrant.configure("2") do |config|
|
18
|
-
+
|
19
|
-
+ config.vm.provider :skytap do |skytap, override|
|
20
|
-
+ skytap.username = "etrue"
|
21
|
-
+ skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
|
22
|
-
+ end
|
23
|
-
+
|
24
|
-
+ config.vm.define :dev do |dev|
|
25
|
-
+ # VMWare and VirtualBox
|
26
|
-
+ # https://vagrantcloud.com/hashicorp/boxes/precise64
|
27
|
-
+ # TODO how to specify different box files for skytap provider
|
28
|
-
+ #dev.vm.box = "hashicorp/precise64"
|
29
|
-
+ #dev.vm.box_url = "hashicorp/precise64"
|
30
|
-
+
|
31
|
-
+
|
32
|
-
+ # dev.vm.network :private_network, ip: "10.10.10.5"
|
33
|
-
+ dev.vm.network :private_network, ip: "10.1.130.252"
|
34
|
-
+ dev.vm.network :forwarded_port, guest: 3001, host: 3001
|
35
|
-
+ dev.vm.network :forwarded_port, guest: 1080, host: 1080
|
36
|
-
+
|
37
|
-
+ dev.vm.synced_folder "~/src", "/var/www/skytap", :nfs => true, :mount_options => ['actimeo=1']
|
38
|
-
+
|
39
|
-
+ dev.vm.provider :vmware_fusion do |box|
|
40
|
-
+ box.vmx["memsize"] = VM_RAM
|
41
|
-
+ box.vmx["numvcpus"] = VM_CPU
|
42
|
-
+ end
|
43
|
-
+
|
44
|
-
+ dev.vm.provider :virtualbox do |box|
|
45
|
-
+ box.customize ["modifyvm", :id, "--memory", VM_RAM]
|
46
|
-
+ box.customize ["modifyvm", :id, "--cpus", VM_CPU]
|
47
|
-
+ box.customize ["modifyvm", :id, "--ioapic", "on"]
|
48
|
-
+ end
|
49
|
-
+
|
50
|
-
+ dev.vm.provider :skytap do |box|
|
51
|
-
+ dev.vm.box = "skytap-dummy"
|
52
|
-
+ box.vm_url = GENERIC_UBUNTU
|
53
|
-
+ box.cpus = VM_CPU
|
54
|
-
+ box.ram = VM_RAM
|
55
|
-
+ box.guestos = "ubuntu"
|
56
|
-
+ end
|
57
|
-
+
|
58
|
-
+ dev.vm.provision :ansible do |ansible|
|
59
|
-
+ ansible.playbook = "ansible/playbooks/webservers.yml"
|
60
|
-
+ # with the skytap provider, let it generate the inventory (.vagrant/provisioners/..)
|
61
|
-
+ #ansible.inventory_path = "ansible/environments/dev"
|
62
|
-
+ end
|
63
|
-
+ end
|
64
|
-
+end
|
65
|
-
diff --git a/ansible b/ansible
|
66
|
-
new file mode 120000
|
67
|
-
--- /dev/null
|
68
|
-
+++ b/ansible
|
69
|
-
@@ -0,0 +1,1 @@
|
70
|
-
+../chuck/ansible
|
71
|
-
|
72
|
-
diff --git a/ansible.cfg b/ansible.cfg
|
73
|
-
new file mode 120000
|
74
|
-
--- /dev/null
|
75
|
-
+++ b/ansible.cfg
|
76
|
-
@@ -0,0 +1,1 @@
|
77
|
-
+../chuck/ansible.cfg
|
78
|
-
|
79
|
-
diff --git a/rake b/rake
|
80
|
-
new file mode 120000
|
81
|
-
--- /dev/null
|
82
|
-
+++ b/rake
|
83
|
-
@@ -0,0 +1,1 @@
|
84
|
-
+../chuck/rake
|
85
|
-
|
86
|
-
diff --git a/rakefile.rb b/rakefile.rb
|
87
|
-
new file mode 120000
|
88
|
-
--- /dev/null
|
89
|
-
+++ b/rakefile.rb
|
90
|
-
@@ -0,0 +1,1 @@
|
91
|
-
+../chuck/rakefile.rb
|
92
|
-
|
@@ -1,40 +0,0 @@
|
|
1
|
-
# HG changeset patch
|
2
|
-
# Parent 1397b5a1cf5158f68afa12477b1de4101b8da248
|
3
|
-
[mq]: cache-api-client-in-up
|
4
|
-
|
5
|
-
diff -r 1397b5a1cf51 lib/vagrant-skytap/action/initialize_api_client.rb
|
6
|
-
--- a/lib/vagrant-skytap/action/initialize_api_client.rb Mon Dec 07 19:47:09 2015 -0800
|
7
|
-
+++ b/lib/vagrant-skytap/action/initialize_api_client.rb Wed Dec 09 16:03:46 2015 -0800
|
8
|
-
@@ -13,11 +13,15 @@
|
9
|
-
end
|
10
|
-
|
11
|
-
def call(env)
|
12
|
-
- @logger.info("Connecting to Skytap...")
|
13
|
-
+ unless env[:api_client]
|
14
|
-
+ @logger.info("Connecting to Skytap...")
|
15
|
-
|
16
|
-
- client = API::Client.new(env[:machine].provider_config)
|
17
|
-
- if client.get('/configurations').code == '200'
|
18
|
-
- env[:api_client] = client
|
19
|
-
+ client = API::Client.new(env[:machine].provider_config)
|
20
|
-
+ if client.get('/configurations').code == '200'
|
21
|
-
+ env[:api_client] = client
|
22
|
-
+ end
|
23
|
-
+ else
|
24
|
-
+ @logger.info("Using cached API client")
|
25
|
-
end
|
26
|
-
|
27
|
-
@app.call(env)
|
28
|
-
diff -r 1397b5a1cf51 lib/vagrant-skytap/command/up.rb
|
29
|
-
--- a/lib/vagrant-skytap/command/up.rb Mon Dec 07 19:47:09 2015 -0800
|
30
|
-
+++ b/lib/vagrant-skytap/command/up.rb Wed Dec 09 16:03:46 2015 -0800
|
31
|
-
@@ -76,7 +76,8 @@
|
32
|
-
provider: machine.provider_name))
|
33
|
-
|
34
|
-
machines << machine
|
35
|
-
- machine.action(:create, options)
|
36
|
-
+ result = machine.action(:create, options)
|
37
|
-
+ options[:api_client] ||= result[:api_client]
|
38
|
-
machine.action(:update_hardware, options)
|
39
|
-
end
|
40
|
-
|
@@ -1,44 +0,0 @@
|
|
1
|
-
# HG changeset patch
|
2
|
-
# Parent 376d225699f6e5edced626762b20690f8a86e566
|
3
|
-
remove dead code in actions.rb
|
4
|
-
|
5
|
-
diff -r 376d225699f6 -r 57b84d076d7f lib/vagrant-skytap/action.rb
|
6
|
-
--- a/lib/vagrant-skytap/action.rb Tue Oct 20 13:31:40 2015 -0700
|
7
|
-
+++ b/lib/vagrant-skytap/action.rb Tue Oct 20 13:31:55 2015 -0700
|
8
|
-
@@ -86,17 +86,11 @@
|
9
|
-
b.use FetchEnvironment
|
10
|
-
b.use Call, EnvironmentExists do |env, b2|
|
11
|
-
if env[:result]
|
12
|
-
- b2.use Call, RunEnvironment do |env2, b3|
|
13
|
-
- if env2[:result]
|
14
|
-
- b3.use PrepareNFSSettings
|
15
|
-
- b3.use PrepareNFSValidIds
|
16
|
-
- b3.use Provision
|
17
|
-
- b3.use SyncedFolders
|
18
|
-
- else
|
19
|
-
- #TODO:NLA IMPLEMENT ME
|
20
|
-
- # b2.use RunFailed
|
21
|
-
- end
|
22
|
-
- end
|
23
|
-
+ b2.use RunEnvironment
|
24
|
-
+ b2.use PrepareNFSSettings
|
25
|
-
+ b2.use PrepareNFSValidIds
|
26
|
-
+ b2.use Provision
|
27
|
-
+ b2.use SyncedFolders
|
28
|
-
else
|
29
|
-
b2.use DeleteEnvironment
|
30
|
-
b2.use MessageNotCreated
|
31
|
-
@@ -217,12 +211,7 @@
|
32
|
-
end
|
33
|
-
end
|
34
|
-
b.use action_prepare_boot
|
35
|
-
- b.use Call, RunVm do |env, b1|
|
36
|
-
- unless env[:result]
|
37
|
-
- #TODO:NLA IMPLEMENT ME
|
38
|
-
- # b2.use RunFailed
|
39
|
-
- end
|
40
|
-
- end
|
41
|
-
+ b.use RunVm
|
42
|
-
end
|
43
|
-
end
|
44
|
-
|
@@ -1,55 +0,0 @@
|
|
1
|
-
# HG changeset patch
|
2
|
-
# Parent 7e9e3ef348d477de33cc44c1eb0ab7ea3cac1f63
|
3
|
-
# Parent b2aa1fa1e5603d434a08013f830ca256a0944559
|
4
|
-
debug changes
|
5
|
-
|
6
|
-
diff -r b2aa1fa1e560 lib/vagrant-skytap.rb
|
7
|
-
--- a/lib/vagrant-skytap.rb Fri Jan 08 11:51:56 2016 -0800
|
8
|
-
+++ b/lib/vagrant-skytap.rb Wed Jan 13 12:22:02 2016 -0800
|
9
|
-
@@ -7,6 +7,9 @@
|
10
|
-
require "vagrant-skytap/core_ext/try"
|
11
|
-
require "vagrant-skytap/plugin"
|
12
|
-
|
13
|
-
+require 'byebug'
|
14
|
-
+require 'awesome_print'
|
15
|
-
+
|
16
|
-
module VagrantPlugins
|
17
|
-
module Skytap
|
18
|
-
lib_path = Pathname.new(File.expand_path("../vagrant-skytap", __FILE__))
|
19
|
-
diff -r b2aa1fa1e560 spec/unit/base.rb
|
20
|
-
--- a/spec/unit/base.rb Fri Jan 08 11:51:56 2016 -0800
|
21
|
-
+++ b/spec/unit/base.rb Wed Jan 13 12:22:02 2016 -0800
|
22
|
-
@@ -5,6 +5,7 @@
|
23
|
-
require "checkpoint"
|
24
|
-
require "rspec/autorun"
|
25
|
-
require "webmock/rspec"
|
26
|
-
+require "byebug"
|
27
|
-
|
28
|
-
# Require Vagrant itself so we can reference the proper
|
29
|
-
# classes to test.
|
30
|
-
diff -r b2aa1fa1e560 vagrant-skytap.gemspec
|
31
|
-
--- a/vagrant-skytap.gemspec Fri Jan 08 11:51:56 2016 -0800
|
32
|
-
+++ b/vagrant-skytap.gemspec Wed Jan 13 12:22:02 2016 -0800
|
33
|
-
@@ -17,6 +17,11 @@
|
34
|
-
|
35
|
-
s.add_runtime_dependency "json_pure"
|
36
|
-
|
37
|
-
+ # MAKE SURE YOU POP THIS PATCH BEFORE DISTRIBUTING OR PUSHING THE GEM!
|
38
|
-
+ s.add_runtime_dependency "byebug"
|
39
|
-
+ s.add_runtime_dependency "pry", "~> 0.10"
|
40
|
-
+ s.add_runtime_dependency "awesome_print"
|
41
|
-
+
|
42
|
-
s.add_development_dependency "rake"
|
43
|
-
s.add_development_dependency "rspec-core", "~> 2.14.0"
|
44
|
-
s.add_development_dependency "rspec-expectations", "~> 2.14.0"
|
45
|
-
@@ -24,6 +29,10 @@
|
46
|
-
s.add_development_dependency "vagrant-spec", "~> 1.4.0"
|
47
|
-
s.add_development_dependency "webmock", "~> 1.20"
|
48
|
-
|
49
|
-
+ s.add_development_dependency "byebug"#, "~> 5.0.0"
|
50
|
-
+ s.add_development_dependency "pry", "~> 0.10"
|
51
|
-
+ s.add_development_dependency "awesome_print"
|
52
|
-
+
|
53
|
-
# The following block of code determines the files that should be included
|
54
|
-
# in the gem. It does this by reading all the files in the directory where
|
55
|
-
# this gemspec is, and parsing out the ignored files from the gitignore.
|