kitchen-zcloudjp 0.2.2 → 0.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/kitchen-zcloudjp.gemspec +1 -1
- data/lib/kitchen/driver/zcloudjp.rb +24 -11
- data/lib/kitchen/driver/zcloudjp_version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
NGY2ZmU2YmEwMTI2MzE4Y2Q3ODA5ZGM1NDgyYjBjMjdjMzdiYmI4Nw==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
Y2E5MzVjNzhkOTcyNjQ2NzEzNmRlYTc1ZThmYmRlNWU4Y2E3NmI3OQ==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
NDIzOGVjYzMzZDBmZjZmODQzZDQ2NDcxNmU5NjdmOWE1ZTkwNmQ1OWIxMDUw
|
10
|
+
ZDA5MzVhYTNmYzU2NWJjOGFjNmFkOTdiYWM2ZmJiMjJhMjczN2U1NzFjOTMw
|
11
|
+
NWU0NmM3OWUyY2E1Nzk1NDNjNTY3YmIyODEwNzI3MWY2MTY3N2Y=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
YTZkMDk0YzI0NGY4YWE1MzI2OThmNzY3OWFiODAxNzkzNWUxNGUyNjcyNWRh
|
14
|
+
MjJjNTY2MGM0YTg2ZTFhMDlkNzcwNjcxYTNkMjEyZThjYmQ1NTk0MmRhOWJi
|
15
|
+
MzViMDIwNTE0MWJiMWExNTMwMTE2MTkzMTA5Nzg3N2U1OGZlMDE=
|
data/kitchen-zcloudjp.gemspec
CHANGED
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
|
|
18
18
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
19
19
|
spec.require_paths = ['lib']
|
20
20
|
|
21
|
-
spec.add_dependency 'test-kitchen', '~> 1.0.0.
|
21
|
+
spec.add_dependency 'test-kitchen', '~> 1.0.0.beta'
|
22
22
|
spec.add_dependency 'zcloudjp'
|
23
23
|
|
24
24
|
spec.add_development_dependency 'bundler', '~> 1.3'
|
@@ -38,11 +38,14 @@ module Kitchen
|
|
38
38
|
state[:server_id] = server.id
|
39
39
|
|
40
40
|
info("SmartMachine <#{state[:server_id]}> created.")
|
41
|
+
debug(server)
|
41
42
|
server.wait_for { print "."; ready? } ; print "(provision queued)"
|
42
43
|
state[:hostname] = server.ips.first
|
43
|
-
|
44
|
+
ssh_args = build_ssh_args(state)
|
45
|
+
wait_for_sshd_vm(ssh_args) ; print "(first reboot)\n"
|
44
46
|
sleep 10
|
45
|
-
|
47
|
+
debug("waiting for second")
|
48
|
+
wait_for_sshd_vm(ssh_args) ; print "(second reboot)\n"
|
46
49
|
sleep 10
|
47
50
|
|
48
51
|
unless server.os == "SmartOS"
|
@@ -53,12 +56,13 @@ module Kitchen
|
|
53
56
|
## Override ruby_binpath to default
|
54
57
|
::Kitchen::Busser.const_set(:DEFAULT_RUBY_BINPATH, '/opt/chef/embedded/bin')
|
55
58
|
else
|
56
|
-
|
59
|
+
wait_for_sshd_vm(ssh_args) ; print "(ssh ready)\n"
|
57
60
|
## Override ruby_binpath
|
58
61
|
::Kitchen::Busser.const_set(:DEFAULT_RUBY_BINPATH, '/opt/local/bin')
|
59
62
|
end
|
60
63
|
end
|
61
64
|
|
65
|
+
|
62
66
|
def destroy(state)
|
63
67
|
return if state[:server_id].nil?
|
64
68
|
server = client.machine.show(:id => state[:server_id])
|
@@ -75,9 +79,8 @@ module Kitchen
|
|
75
79
|
state.delete(:hostname)
|
76
80
|
end
|
77
81
|
|
78
|
-
def setup(state)
|
79
|
-
ssh_args = build_ssh_args(state)
|
80
82
|
|
83
|
+
def setup(state)
|
81
84
|
server = client.machine.show(:id => state[:server_id])
|
82
85
|
unless server.os == "SmartOS"
|
83
86
|
## Override ruby_binpath to default
|
@@ -87,13 +90,16 @@ module Kitchen
|
|
87
90
|
::Kitchen::Busser.const_set(:DEFAULT_RUBY_BINPATH, '/opt/local/bin')
|
88
91
|
end
|
89
92
|
|
90
|
-
|
91
|
-
|
93
|
+
Kitchen::SSH.new(*build_ssh_args(state)) do |conn|
|
94
|
+
debug(busser_setup_cmd)
|
95
|
+
run_remote(busser_setup_cmd, conn)
|
92
96
|
end
|
93
97
|
end
|
94
98
|
|
95
99
|
|
96
100
|
def converge(state)
|
101
|
+
provisioner = new_provisioner
|
102
|
+
|
97
103
|
server = client.machine.show(:id => state[:server_id])
|
98
104
|
info("--> Updating metadata...")
|
99
105
|
server.metadata.update(:metadata => build_metadata)
|
@@ -103,11 +109,18 @@ module Kitchen
|
|
103
109
|
install_chef_for_smartos(ssh_args)
|
104
110
|
else
|
105
111
|
fix_monkey_dataset(ssh_args)
|
106
|
-
install_omnibus(ssh_args) if config[:require_chef_omnibus]
|
112
|
+
# install_omnibus(ssh_args) if config[:require_chef_omnibus]
|
113
|
+
end
|
114
|
+
|
115
|
+
Kitchen::SSH.new(*build_ssh_args(state)) do |conn|
|
116
|
+
run_remote(provisioner.install_command, conn)
|
117
|
+
run_remote(provisioner.init_command, conn)
|
118
|
+
transfer_path(provisioner.create_sandbox, provisioner.home_path, conn)
|
119
|
+
run_remote(provisioner.prepare_command, conn)
|
120
|
+
run_remote(provisioner.run_command, conn)
|
107
121
|
end
|
108
|
-
|
109
|
-
|
110
|
-
run_chef_solo(ssh_args)
|
122
|
+
ensure
|
123
|
+
provisioner && provisioner.cleanup_sandbox
|
111
124
|
end
|
112
125
|
|
113
126
|
def client
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kitchen-zcloudjp
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.3.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- sawanoboly
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-07-
|
11
|
+
date: 2013-07-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: test-kitchen
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - ~>
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 1.0.0.
|
19
|
+
version: 1.0.0.beta
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - ~>
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 1.0.0.
|
26
|
+
version: 1.0.0.beta
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: zcloudjp
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|