joyent-provisioner 1.0.1 → 1.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Rakefile +6 -1
- data/conf/configuration.yml.example +9 -1
- data/joyent-provisioner.gemspec +1 -1
- data/lib/provisioner/command/provision.rb +1 -0
- data/lib/provisioner/version.rb +1 -1
- data/spec/provisioner/cli/host_spec.rb +12 -1
- data/spec/provisioner/command/provision_spec.rb +2 -0
- metadata +30 -29
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: fe09a5771e1b1681e5f0e930c8aa8e3b233b7765
|
|
4
|
+
data.tar.gz: 1ae3401ea7fd9ae0deeba26652bd5c96de36ed47
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7fb38b8a0029d19c5729b1e912c13f504faa6e386bb9670df703373171e460b17fa1cfb4f635460ec3eae7b8aa79a200957639ed390651a56b502934326aa41b
|
|
7
|
+
data.tar.gz: 42aa53c944d2f02146aabb358410941c3a4ae9ddccbbb62bd74460e435a332e4b6aad10435788d724299582e5a27e3c03b5b84b502fcd41c5d3effc8d0f77281
|
data/Rakefile
CHANGED
|
@@ -2,7 +2,6 @@ global:
|
|
|
2
2
|
environment: test
|
|
3
3
|
host_suffix: test
|
|
4
4
|
log_dir: ./tmp
|
|
5
|
-
ssh_user: ops
|
|
6
5
|
|
|
7
6
|
templates:
|
|
8
7
|
memcached-sessions:
|
|
@@ -14,3 +13,12 @@ templates:
|
|
|
14
13
|
host_sequence: 1..2
|
|
15
14
|
host_prefix: memcached-sessions
|
|
16
15
|
|
|
16
|
+
memcached-sessions-ssh:
|
|
17
|
+
image: 9ec5c0c-a941-11e2-a7dc-57a6b041988f
|
|
18
|
+
flavor: "g3-highmemory-17.125-smartos"
|
|
19
|
+
distro: smartos-base64
|
|
20
|
+
networks: "42325ea0-eb62-44c1-8eb6-0af3e2f83abc,c8cde927-6277-49ca-82a3-741e8b23b02f"
|
|
21
|
+
run_list: "role[joyent]"
|
|
22
|
+
host_sequence: 1..2
|
|
23
|
+
host_prefix: memcached-sessions-ssh
|
|
24
|
+
ssh_user: ops
|
data/joyent-provisioner.gemspec
CHANGED
|
@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
|
|
|
27
27
|
spec.add_development_dependency 'guard'
|
|
28
28
|
spec.add_development_dependency 'guard-rspec'
|
|
29
29
|
spec.add_development_dependency 'rspec'
|
|
30
|
-
spec.add_development_dependency 'pry-
|
|
30
|
+
spec.add_development_dependency 'pry-nav'
|
|
31
31
|
spec.add_development_dependency 'aruba-doubles'
|
|
32
32
|
end
|
|
@@ -21,6 +21,7 @@ module Provisioner
|
|
|
21
21
|
|
|
22
22
|
log_path = "#{log_dir}/#{host_name}_provision.log"
|
|
23
23
|
command << "--run-list #{run_list}" if run_list
|
|
24
|
+
command << "--ssh-user #{ssh_user}" if ssh_user
|
|
24
25
|
command << "--tags '#{encoded_tags}'" if tags
|
|
25
26
|
command << "2>&1 > #{log_path} &"
|
|
26
27
|
|
data/lib/provisioner/version.rb
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
|
|
1
2
|
require 'spec_helper'
|
|
2
3
|
|
|
3
4
|
describe 'provision cli' do
|
|
@@ -9,7 +10,7 @@ describe 'provision cli' do
|
|
|
9
10
|
|
|
10
11
|
describe 'host number is provided' do
|
|
11
12
|
let(:expected_command) {'knife joyent server create --image 9ec5c0c-a941-11e2-a7dc-57a6b041988f --flavor g3-highmemory-17.125-smartos --distro smartos-base64 --networks 42325ea0-eb62-44c1-8eb6-0af3e2f83abc,c8cde927-6277-49ca-82a3-741e8b23b02f --environment test --node-name memcached-sessions545.test --run-list role[joyent] 2>&1 > ./tmp/memcached-sessions545.test_provision.log &'}
|
|
12
|
-
it 'reads the configuration and generates command' do
|
|
13
|
+
it 'reads the configuration and generates command from memcached-sessions' do
|
|
13
14
|
result = execute('provisioner provision --number 545 --config conf/configuration.yml.example --template memcached-sessions')
|
|
14
15
|
expect(result).to eq(expected_command)
|
|
15
16
|
end
|
|
@@ -18,6 +19,14 @@ describe 'provision cli' do
|
|
|
18
19
|
result = execute('provisioner provision -n 545 -c conf/configuration.yml.example -t memcached-sessions')
|
|
19
20
|
expect(result).to eq(expected_command)
|
|
20
21
|
end
|
|
22
|
+
|
|
23
|
+
let(:expected_command_ssh) {'knife joyent server create --image 9ec5c0c-a941-11e2-a7dc-57a6b041988f --flavor g3-highmemory-17.125-smartos --distro smartos-base64 --networks 42325ea0-eb62-44c1-8eb6-0af3e2f83abc,c8cde927-6277-49ca-82a3-741e8b23b02f --environment test --node-name memcached-sessions-ssh545.test --run-list role[joyent] --ssh-user ops 2>&1 > ./tmp/memcached-sessions-ssh545.test_provision.log &'}
|
|
24
|
+
it 'reads the configuration and generates command from memcached-sessions2' do
|
|
25
|
+
result = execute('provisioner provision --number 545 --config conf/configuration.yml.example --template memcached-sessions-ssh')
|
|
26
|
+
expect(result).to eq(expected_command_ssh)
|
|
27
|
+
end
|
|
28
|
+
|
|
29
|
+
|
|
21
30
|
end
|
|
22
31
|
|
|
23
32
|
describe 'host number is not provided' do
|
|
@@ -30,3 +39,5 @@ describe 'provision cli' do
|
|
|
30
39
|
end
|
|
31
40
|
end
|
|
32
41
|
end
|
|
42
|
+
|
|
43
|
+
|
|
@@ -15,6 +15,7 @@ describe Provisioner::Command::Provision do
|
|
|
15
15
|
'--environment test',
|
|
16
16
|
'--node-name memcached-sessions001.test',
|
|
17
17
|
'--run-list role[joyent]',
|
|
18
|
+
'--ssh-user ops',
|
|
18
19
|
] }
|
|
19
20
|
|
|
20
21
|
let(:expected_command) { [
|
|
@@ -34,6 +35,7 @@ describe Provisioner::Command::Provision do
|
|
|
34
35
|
host_prefix: 'memcached-sessions',
|
|
35
36
|
environment: 'test',
|
|
36
37
|
log_dir: './tmp',
|
|
38
|
+
ssh_user: 'ops',
|
|
37
39
|
run_list: 'role[joyent]'
|
|
38
40
|
} }
|
|
39
41
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: joyent-provisioner
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0
|
|
4
|
+
version: 1.1.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Konstantin Gredeskoul
|
|
@@ -10,146 +10,146 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2014-
|
|
13
|
+
date: 2014-05-14 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: mixlib-cli
|
|
17
17
|
requirement: !ruby/object:Gem::Requirement
|
|
18
18
|
requirements:
|
|
19
|
-
- -
|
|
19
|
+
- - ">="
|
|
20
20
|
- !ruby/object:Gem::Version
|
|
21
21
|
version: '0'
|
|
22
22
|
type: :runtime
|
|
23
23
|
prerelease: false
|
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
|
25
25
|
requirements:
|
|
26
|
-
- -
|
|
26
|
+
- - ">="
|
|
27
27
|
- !ruby/object:Gem::Version
|
|
28
28
|
version: '0'
|
|
29
29
|
- !ruby/object:Gem::Dependency
|
|
30
30
|
name: chef
|
|
31
31
|
requirement: !ruby/object:Gem::Requirement
|
|
32
32
|
requirements:
|
|
33
|
-
- -
|
|
33
|
+
- - ">="
|
|
34
34
|
- !ruby/object:Gem::Version
|
|
35
35
|
version: '0'
|
|
36
36
|
type: :runtime
|
|
37
37
|
prerelease: false
|
|
38
38
|
version_requirements: !ruby/object:Gem::Requirement
|
|
39
39
|
requirements:
|
|
40
|
-
- -
|
|
40
|
+
- - ">="
|
|
41
41
|
- !ruby/object:Gem::Version
|
|
42
42
|
version: '0'
|
|
43
43
|
- !ruby/object:Gem::Dependency
|
|
44
44
|
name: knife-joyent
|
|
45
45
|
requirement: !ruby/object:Gem::Requirement
|
|
46
46
|
requirements:
|
|
47
|
-
- -
|
|
47
|
+
- - ">="
|
|
48
48
|
- !ruby/object:Gem::Version
|
|
49
49
|
version: 0.3.4
|
|
50
50
|
type: :runtime
|
|
51
51
|
prerelease: false
|
|
52
52
|
version_requirements: !ruby/object:Gem::Requirement
|
|
53
53
|
requirements:
|
|
54
|
-
- -
|
|
54
|
+
- - ">="
|
|
55
55
|
- !ruby/object:Gem::Version
|
|
56
56
|
version: 0.3.4
|
|
57
57
|
- !ruby/object:Gem::Dependency
|
|
58
58
|
name: bundler
|
|
59
59
|
requirement: !ruby/object:Gem::Requirement
|
|
60
60
|
requirements:
|
|
61
|
-
- - ~>
|
|
61
|
+
- - "~>"
|
|
62
62
|
- !ruby/object:Gem::Version
|
|
63
63
|
version: '1.3'
|
|
64
64
|
type: :development
|
|
65
65
|
prerelease: false
|
|
66
66
|
version_requirements: !ruby/object:Gem::Requirement
|
|
67
67
|
requirements:
|
|
68
|
-
- - ~>
|
|
68
|
+
- - "~>"
|
|
69
69
|
- !ruby/object:Gem::Version
|
|
70
70
|
version: '1.3'
|
|
71
71
|
- !ruby/object:Gem::Dependency
|
|
72
72
|
name: rake
|
|
73
73
|
requirement: !ruby/object:Gem::Requirement
|
|
74
74
|
requirements:
|
|
75
|
-
- -
|
|
75
|
+
- - ">="
|
|
76
76
|
- !ruby/object:Gem::Version
|
|
77
77
|
version: '0'
|
|
78
78
|
type: :development
|
|
79
79
|
prerelease: false
|
|
80
80
|
version_requirements: !ruby/object:Gem::Requirement
|
|
81
81
|
requirements:
|
|
82
|
-
- -
|
|
82
|
+
- - ">="
|
|
83
83
|
- !ruby/object:Gem::Version
|
|
84
84
|
version: '0'
|
|
85
85
|
- !ruby/object:Gem::Dependency
|
|
86
86
|
name: guard
|
|
87
87
|
requirement: !ruby/object:Gem::Requirement
|
|
88
88
|
requirements:
|
|
89
|
-
- -
|
|
89
|
+
- - ">="
|
|
90
90
|
- !ruby/object:Gem::Version
|
|
91
91
|
version: '0'
|
|
92
92
|
type: :development
|
|
93
93
|
prerelease: false
|
|
94
94
|
version_requirements: !ruby/object:Gem::Requirement
|
|
95
95
|
requirements:
|
|
96
|
-
- -
|
|
96
|
+
- - ">="
|
|
97
97
|
- !ruby/object:Gem::Version
|
|
98
98
|
version: '0'
|
|
99
99
|
- !ruby/object:Gem::Dependency
|
|
100
100
|
name: guard-rspec
|
|
101
101
|
requirement: !ruby/object:Gem::Requirement
|
|
102
102
|
requirements:
|
|
103
|
-
- -
|
|
103
|
+
- - ">="
|
|
104
104
|
- !ruby/object:Gem::Version
|
|
105
105
|
version: '0'
|
|
106
106
|
type: :development
|
|
107
107
|
prerelease: false
|
|
108
108
|
version_requirements: !ruby/object:Gem::Requirement
|
|
109
109
|
requirements:
|
|
110
|
-
- -
|
|
110
|
+
- - ">="
|
|
111
111
|
- !ruby/object:Gem::Version
|
|
112
112
|
version: '0'
|
|
113
113
|
- !ruby/object:Gem::Dependency
|
|
114
114
|
name: rspec
|
|
115
115
|
requirement: !ruby/object:Gem::Requirement
|
|
116
116
|
requirements:
|
|
117
|
-
- -
|
|
117
|
+
- - ">="
|
|
118
118
|
- !ruby/object:Gem::Version
|
|
119
119
|
version: '0'
|
|
120
120
|
type: :development
|
|
121
121
|
prerelease: false
|
|
122
122
|
version_requirements: !ruby/object:Gem::Requirement
|
|
123
123
|
requirements:
|
|
124
|
-
- -
|
|
124
|
+
- - ">="
|
|
125
125
|
- !ruby/object:Gem::Version
|
|
126
126
|
version: '0'
|
|
127
127
|
- !ruby/object:Gem::Dependency
|
|
128
|
-
name: pry-
|
|
128
|
+
name: pry-nav
|
|
129
129
|
requirement: !ruby/object:Gem::Requirement
|
|
130
130
|
requirements:
|
|
131
|
-
- -
|
|
131
|
+
- - ">="
|
|
132
132
|
- !ruby/object:Gem::Version
|
|
133
133
|
version: '0'
|
|
134
134
|
type: :development
|
|
135
135
|
prerelease: false
|
|
136
136
|
version_requirements: !ruby/object:Gem::Requirement
|
|
137
137
|
requirements:
|
|
138
|
-
- -
|
|
138
|
+
- - ">="
|
|
139
139
|
- !ruby/object:Gem::Version
|
|
140
140
|
version: '0'
|
|
141
141
|
- !ruby/object:Gem::Dependency
|
|
142
142
|
name: aruba-doubles
|
|
143
143
|
requirement: !ruby/object:Gem::Requirement
|
|
144
144
|
requirements:
|
|
145
|
-
- -
|
|
145
|
+
- - ">="
|
|
146
146
|
- !ruby/object:Gem::Version
|
|
147
147
|
version: '0'
|
|
148
148
|
type: :development
|
|
149
149
|
prerelease: false
|
|
150
150
|
version_requirements: !ruby/object:Gem::Requirement
|
|
151
151
|
requirements:
|
|
152
|
-
- -
|
|
152
|
+
- - ">="
|
|
153
153
|
- !ruby/object:Gem::Version
|
|
154
154
|
version: '0'
|
|
155
155
|
description: Wrapper gem around provisioning clusters of servers on Joyent cloud
|
|
@@ -162,9 +162,9 @@ executables:
|
|
|
162
162
|
extensions: []
|
|
163
163
|
extra_rdoc_files: []
|
|
164
164
|
files:
|
|
165
|
-
- .gitignore
|
|
166
|
-
- .rspec
|
|
167
|
-
- .travis.yml
|
|
165
|
+
- ".gitignore"
|
|
166
|
+
- ".rspec"
|
|
167
|
+
- ".travis.yml"
|
|
168
168
|
- Gemfile
|
|
169
169
|
- Guardfile
|
|
170
170
|
- LICENSE.txt
|
|
@@ -206,17 +206,17 @@ require_paths:
|
|
|
206
206
|
- lib
|
|
207
207
|
required_ruby_version: !ruby/object:Gem::Requirement
|
|
208
208
|
requirements:
|
|
209
|
-
- -
|
|
209
|
+
- - ">="
|
|
210
210
|
- !ruby/object:Gem::Version
|
|
211
211
|
version: '0'
|
|
212
212
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
213
213
|
requirements:
|
|
214
|
-
- -
|
|
214
|
+
- - ">="
|
|
215
215
|
- !ruby/object:Gem::Version
|
|
216
216
|
version: '0'
|
|
217
217
|
requirements: []
|
|
218
218
|
rubyforge_project:
|
|
219
|
-
rubygems_version: 2.0
|
|
219
|
+
rubygems_version: 2.2.0
|
|
220
220
|
signing_key:
|
|
221
221
|
specification_version: 4
|
|
222
222
|
summary: Wrapper gem around provisioning clusters of servers on Joyent cloud
|
|
@@ -230,3 +230,4 @@ test_files:
|
|
|
230
230
|
- spec/provisioner/host_ip_spec.rb
|
|
231
231
|
- spec/spec_helper.rb
|
|
232
232
|
- spec/support/aruba.rb
|
|
233
|
+
has_rdoc:
|