fhcap-cli 0.4.12 → 0.4.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +18 -1
- data/lib/cookbooks/provision/recipes/cluster_bootstrap_instances.rb +2 -1
- data/lib/fhcap/cluster.rb +17 -2
- data/lib/fhcap/component.rb +2 -2
- data/lib/fhcap/config.rb +1 -1
- data/lib/fhcap/provider.rb +2 -1
- data/lib/fhcap/repos_helper.rb +7 -1
- data/lib/fhcap/tasks/chef/cookbook/update_artifact.rb +13 -1
- data/lib/fhcap/tasks/chef/cookbook/update_config.rb +5 -0
- data/lib/fhcap/tasks/chef/environments/update_attributes.rb +47 -0
- data/lib/fhcap/tasks/chef/server/info.rb +12 -2
- data/lib/fhcap/tasks/cluster/create_dns_records.rb +4 -3
- data/lib/fhcap/tasks/cluster/create_environment.rb +2 -2
- data/lib/fhcap/tasks/cluster/generate.rb +2 -1
- data/lib/fhcap/tasks/cluster/info.rb +36 -9
- data/lib/fhcap/tasks/cluster/update_environment_attributes.rb +19 -0
- data/lib/fhcap/tasks/knife/add.rb +1 -1
- data/lib/fhcap/tasks/knife/remove.rb +1 -1
- data/lib/fhcap/tasks/provider/add.rb +3 -1
- data/lib/fhcap/tasks/provider/remove.rb +1 -1
- data/lib/fhcap/tasks/repo/add.rb +1 -1
- data/lib/fhcap/tasks/repo/checkout.rb +2 -1
- data/lib/fhcap/tasks/repo/remove.rb +1 -1
- data/lib/fhcap/tasks/setup.rb +1 -1
- data/lib/fhcap/version.rb +1 -1
- data/lib/fhcap.rb +1 -1
- data/spec/fhcap/tasks/chef/cookbook/update_artifact_spec.rb +1 -1
- data/spec/fhcap/tasks/chef/environments/update_attributes_spec.rb +33 -0
- data/spec/fhcap/tasks/cluster/update_environment_attributes_spec.rb +40 -0
- data/spec/fhcap/tasks/provider/add_spec.rb +24 -0
- data/templates/chef/environment_core.json.erb +2 -2
- data/templates/chef/{environment_ose-multi-node.json.erb → environment_oscp.json.erb} +5 -1
- data/templates/chef/environment_ose-single.json.erb +3 -2
- data/templates/chef/environment_single.json.erb +3 -3
- data/templates/cluster/aws/common.json.erb +1 -0
- data/templates/cluster/aws/{ose-multi-node.json.erb → oscp-5node.json.erb} +78 -36
- data/templates/cluster/aws/oscp-7node.json.erb +352 -0
- data/templates/cluster/aws/ose-single.json.erb +1 -0
- data/templates/cluster/openstack/common.json.erb +2 -1
- data/templates/cluster/openstack/oscp-5node.json.erb +68 -0
- data/templates/cluster/openstack/oscp-7node.json.erb +91 -0
- data/templates/cluster/oscp-5node.json.erb +8 -0
- data/templates/cluster/oscp-7node.json.erb +8 -0
- data/templates/kitchen/kitchen.aws.yml.erb +4 -0
- metadata +15 -6
- data/templates/cluster/openstack/ose-multi-node.json.erb +0 -30
- data/templates/cluster/ose-multi-node.json.erb +0 -8
|
@@ -0,0 +1,352 @@
|
|
|
1
|
+
{
|
|
2
|
+
"domain": "<%= config[:domain] %>",
|
|
3
|
+
<%- unless config[:provider_config][:cidr] == "none" -%>
|
|
4
|
+
"subnets": {
|
|
5
|
+
"1a": {
|
|
6
|
+
"cidr": "0/26",
|
|
7
|
+
"availability_zone": "1a"
|
|
8
|
+
},
|
|
9
|
+
"1b": {
|
|
10
|
+
"cidr": "64/26",
|
|
11
|
+
"availability_zone": "1b"
|
|
12
|
+
},
|
|
13
|
+
"1c": {
|
|
14
|
+
"cidr": "128/26",
|
|
15
|
+
"availability_zone": "1c"
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
"vpc": {
|
|
19
|
+
"enable_dns_support": true,
|
|
20
|
+
"enable_dns_hostnames": true
|
|
21
|
+
},
|
|
22
|
+
<%- end -%>
|
|
23
|
+
"security_groups": {
|
|
24
|
+
"<%= config[:environment_name] %>-oscp-master": {
|
|
25
|
+
"authorize_ingress": [
|
|
26
|
+
{
|
|
27
|
+
"protocols": [
|
|
28
|
+
"all"
|
|
29
|
+
],
|
|
30
|
+
"start": 0,
|
|
31
|
+
"end": 65535,
|
|
32
|
+
"groups": [
|
|
33
|
+
"<%= config[:environment_name] %>-oscp-master",
|
|
34
|
+
"<%= config[:environment_name] %>-oscp-node",
|
|
35
|
+
"<%= config[:environment_name] %>-oscp-nfs",
|
|
36
|
+
"<%= config[:environment_name] %>-oscp-infra"
|
|
37
|
+
]
|
|
38
|
+
},
|
|
39
|
+
{
|
|
40
|
+
"protocols": [
|
|
41
|
+
"icmp"
|
|
42
|
+
],
|
|
43
|
+
"start": -1,
|
|
44
|
+
"end": -1,
|
|
45
|
+
"groups": [
|
|
46
|
+
"<%= config[:environment_name] %>-oscp-master",
|
|
47
|
+
"<%= config[:environment_name] %>-oscp-node",
|
|
48
|
+
"<%= config[:environment_name] %>-oscp-nfs",
|
|
49
|
+
"<%= config[:environment_name] %>-oscp-infra"
|
|
50
|
+
]
|
|
51
|
+
},
|
|
52
|
+
{
|
|
53
|
+
"protocols": [
|
|
54
|
+
"tcp"
|
|
55
|
+
],
|
|
56
|
+
"start": 8443,
|
|
57
|
+
"end": 8443,
|
|
58
|
+
"sources": [
|
|
59
|
+
"0.0.0.0/0"
|
|
60
|
+
]
|
|
61
|
+
}
|
|
62
|
+
]
|
|
63
|
+
},
|
|
64
|
+
"<%= config[:environment_name] %>-oscp-node": {
|
|
65
|
+
"authorize_ingress": [
|
|
66
|
+
{
|
|
67
|
+
"protocols": [
|
|
68
|
+
"all"
|
|
69
|
+
],
|
|
70
|
+
"start": 0,
|
|
71
|
+
"end": 65535,
|
|
72
|
+
"groups": [
|
|
73
|
+
"<%= config[:environment_name] %>-oscp-master",
|
|
74
|
+
"<%= config[:environment_name] %>-oscp-node",
|
|
75
|
+
"<%= config[:environment_name] %>-oscp-nfs",
|
|
76
|
+
"<%= config[:environment_name] %>-oscp-infra"
|
|
77
|
+
]
|
|
78
|
+
},
|
|
79
|
+
{
|
|
80
|
+
"protocols": [
|
|
81
|
+
"icmp"
|
|
82
|
+
],
|
|
83
|
+
"start": -1,
|
|
84
|
+
"end": -1,
|
|
85
|
+
"groups": [
|
|
86
|
+
"<%= config[:environment_name] %>-oscp-master",
|
|
87
|
+
"<%= config[:environment_name] %>-oscp-node",
|
|
88
|
+
"<%= config[:environment_name] %>-oscp-nfs",
|
|
89
|
+
"<%= config[:environment_name] %>-oscp-infra"
|
|
90
|
+
]
|
|
91
|
+
}
|
|
92
|
+
]
|
|
93
|
+
},
|
|
94
|
+
"<%= config[:environment_name] %>-oscp-lb": {
|
|
95
|
+
"authorize_ingress": [
|
|
96
|
+
{
|
|
97
|
+
"protocols": [
|
|
98
|
+
"tcp"
|
|
99
|
+
],
|
|
100
|
+
"start": 80,
|
|
101
|
+
"end": 80,
|
|
102
|
+
"sources": [
|
|
103
|
+
"0.0.0.0/0"
|
|
104
|
+
]
|
|
105
|
+
}
|
|
106
|
+
]
|
|
107
|
+
},
|
|
108
|
+
"<%= config[:environment_name] %>-oscp-nfs": {
|
|
109
|
+
"authorize_ingress": [
|
|
110
|
+
{
|
|
111
|
+
"protocols": [
|
|
112
|
+
"all"
|
|
113
|
+
],
|
|
114
|
+
"start": 0,
|
|
115
|
+
"end": 65535,
|
|
116
|
+
"groups": [
|
|
117
|
+
"<%= config[:environment_name] %>-oscp-master",
|
|
118
|
+
"<%= config[:environment_name] %>-oscp-node",
|
|
119
|
+
"<%= config[:environment_name] %>-oscp-nfs",
|
|
120
|
+
"<%= config[:environment_name] %>-oscp-infra"
|
|
121
|
+
]
|
|
122
|
+
},
|
|
123
|
+
{
|
|
124
|
+
"protocols": [
|
|
125
|
+
"icmp"
|
|
126
|
+
],
|
|
127
|
+
"start": -1,
|
|
128
|
+
"end": -1,
|
|
129
|
+
"groups": [
|
|
130
|
+
"<%= config[:environment_name] %>-oscp-master",
|
|
131
|
+
"<%= config[:environment_name] %>-oscp-node",
|
|
132
|
+
"<%= config[:environment_name] %>-oscp-nfs",
|
|
133
|
+
"<%= config[:environment_name] %>-oscp-infra"
|
|
134
|
+
]
|
|
135
|
+
}
|
|
136
|
+
]
|
|
137
|
+
},
|
|
138
|
+
"<%= config[:environment_name] %>-oscp-infra": {
|
|
139
|
+
"authorize_ingress": [
|
|
140
|
+
{
|
|
141
|
+
"protocols": [
|
|
142
|
+
"all"
|
|
143
|
+
],
|
|
144
|
+
"start": 0,
|
|
145
|
+
"end": 65535,
|
|
146
|
+
"groups": [
|
|
147
|
+
"<%= config[:environment_name] %>-oscp-master",
|
|
148
|
+
"<%= config[:environment_name] %>-oscp-node",
|
|
149
|
+
"<%= config[:environment_name] %>-oscp-nfs",
|
|
150
|
+
"<%= config[:environment_name] %>-oscp-lb",
|
|
151
|
+
"<%= config[:environment_name] %>-oscp-infra"
|
|
152
|
+
]
|
|
153
|
+
},
|
|
154
|
+
{
|
|
155
|
+
"protocols": [
|
|
156
|
+
"icmp"
|
|
157
|
+
],
|
|
158
|
+
"start": -1,
|
|
159
|
+
"end": -1,
|
|
160
|
+
"groups": [
|
|
161
|
+
"<%= config[:environment_name] %>-oscp-master",
|
|
162
|
+
"<%= config[:environment_name] %>-oscp-node",
|
|
163
|
+
"<%= config[:environment_name] %>-oscp-nfs",
|
|
164
|
+
"<%= config[:environment_name] %>-oscp-lb",
|
|
165
|
+
"<%= config[:environment_name] %>-oscp-infra"
|
|
166
|
+
]
|
|
167
|
+
}
|
|
168
|
+
]
|
|
169
|
+
}
|
|
170
|
+
},
|
|
171
|
+
"load_balancers": {
|
|
172
|
+
"oscp-lb": {
|
|
173
|
+
"security_groups": ["<%= config[:environment_name] %>-oscp-lb"],
|
|
174
|
+
"subnets": ["1a", "1b", "1c"],
|
|
175
|
+
"scheme": "internet-facing",
|
|
176
|
+
"listeners": [
|
|
177
|
+
{
|
|
178
|
+
"port": 80,
|
|
179
|
+
"protocol": "http",
|
|
180
|
+
"instance_port": 80,
|
|
181
|
+
"instance_protocol": "http"
|
|
182
|
+
}
|
|
183
|
+
]
|
|
184
|
+
}
|
|
185
|
+
},
|
|
186
|
+
"instances": {
|
|
187
|
+
"master1": {
|
|
188
|
+
"aws": {
|
|
189
|
+
"instance_type": "m3.large",
|
|
190
|
+
"security_groups": [
|
|
191
|
+
"ops-admin",
|
|
192
|
+
"<%= config[:environment_name] %>-oscp-master"
|
|
193
|
+
]
|
|
194
|
+
<%- unless config[:provider_config][:cidr] == "none" -%>
|
|
195
|
+
,"private_ip_address": "",
|
|
196
|
+
"subnet": "1a"
|
|
197
|
+
<%- end -%>
|
|
198
|
+
},
|
|
199
|
+
"run_list": [
|
|
200
|
+
"role[ose_master_server]"
|
|
201
|
+
],
|
|
202
|
+
"chef_attributes":{
|
|
203
|
+
"openshift":{
|
|
204
|
+
"labels":{
|
|
205
|
+
"name": "master1"
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
},
|
|
210
|
+
"infra1": {
|
|
211
|
+
"aws": {
|
|
212
|
+
"instance_type": "m3.large",
|
|
213
|
+
"security_groups": [
|
|
214
|
+
"ops-admin",
|
|
215
|
+
"<%= config[:environment_name] %>-oscp-infra"
|
|
216
|
+
]
|
|
217
|
+
<%- unless config[:provider_config][:cidr] == "none" -%>
|
|
218
|
+
,"private_ip_address": "",
|
|
219
|
+
"subnet": "1a"
|
|
220
|
+
<%- end -%>
|
|
221
|
+
},
|
|
222
|
+
"run_list": [
|
|
223
|
+
"role[ose_node_server]"
|
|
224
|
+
],
|
|
225
|
+
"load_balancers": ["oscp-lb"],
|
|
226
|
+
"chef_attributes":{
|
|
227
|
+
"openshift":{
|
|
228
|
+
"labels":{
|
|
229
|
+
"name": "infra1",
|
|
230
|
+
"region": "infra"
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
},
|
|
235
|
+
"infra2": {
|
|
236
|
+
"aws": {
|
|
237
|
+
"instance_type": "m3.large",
|
|
238
|
+
"security_groups": [
|
|
239
|
+
"ops-admin",
|
|
240
|
+
"<%= config[:environment_name] %>-oscp-infra"
|
|
241
|
+
]
|
|
242
|
+
<%- unless config[:provider_config][:cidr] == "none" -%>
|
|
243
|
+
,"private_ip_address": "",
|
|
244
|
+
"subnet": "1b"
|
|
245
|
+
<%- end -%>
|
|
246
|
+
},
|
|
247
|
+
"run_list": [
|
|
248
|
+
"role[ose_node_server]"
|
|
249
|
+
],
|
|
250
|
+
"load_balancers": ["oscp-lb"],
|
|
251
|
+
"chef_attributes":{
|
|
252
|
+
"openshift":{
|
|
253
|
+
"labels":{
|
|
254
|
+
"name": "infra2",
|
|
255
|
+
"region": "infra"
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
},
|
|
260
|
+
"node1": {
|
|
261
|
+
"aws": {
|
|
262
|
+
"instance_type": "m3.xlarge",
|
|
263
|
+
"security_groups": [
|
|
264
|
+
"ops-admin",
|
|
265
|
+
"<%= config[:environment_name] %>-oscp-node"
|
|
266
|
+
]
|
|
267
|
+
<%- unless config[:provider_config][:cidr] == "none" -%>
|
|
268
|
+
,"private_ip_address": "",
|
|
269
|
+
"subnet": "1a"
|
|
270
|
+
<%- end -%>
|
|
271
|
+
},
|
|
272
|
+
"run_list": [
|
|
273
|
+
"role[ose_node_server]"
|
|
274
|
+
],
|
|
275
|
+
"chef_attributes":{
|
|
276
|
+
"openshift":{
|
|
277
|
+
"labels":{
|
|
278
|
+
"name": "node1"
|
|
279
|
+
}
|
|
280
|
+
}
|
|
281
|
+
}
|
|
282
|
+
},
|
|
283
|
+
"node2": {
|
|
284
|
+
"aws": {
|
|
285
|
+
"instance_type": "m3.xlarge",
|
|
286
|
+
"security_groups": [
|
|
287
|
+
"ops-admin",
|
|
288
|
+
"<%= config[:environment_name] %>-oscp-node"
|
|
289
|
+
]
|
|
290
|
+
<%- unless config[:provider_config][:cidr] == "none" -%>
|
|
291
|
+
,"private_ip_address": "",
|
|
292
|
+
"subnet": "1b"
|
|
293
|
+
<%- end -%>
|
|
294
|
+
},
|
|
295
|
+
"run_list": [
|
|
296
|
+
"role[ose_node_server]"
|
|
297
|
+
],
|
|
298
|
+
"chef_attributes":{
|
|
299
|
+
"openshift":{
|
|
300
|
+
"labels":{
|
|
301
|
+
"name": "node2"
|
|
302
|
+
}
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
},
|
|
306
|
+
"node3": {
|
|
307
|
+
"aws": {
|
|
308
|
+
"instance_type": "m3.xlarge",
|
|
309
|
+
"security_groups": [
|
|
310
|
+
"ops-admin",
|
|
311
|
+
"<%= config[:environment_name] %>-oscp-node"
|
|
312
|
+
]
|
|
313
|
+
<%- unless config[:provider_config][:cidr] == "none" -%>
|
|
314
|
+
,"private_ip_address": "",
|
|
315
|
+
"subnet": "1c"
|
|
316
|
+
<%- end -%>
|
|
317
|
+
},
|
|
318
|
+
"run_list": [
|
|
319
|
+
"role[ose_node_server]"
|
|
320
|
+
],
|
|
321
|
+
"chef_attributes":{
|
|
322
|
+
"openshift":{
|
|
323
|
+
"labels":{
|
|
324
|
+
"name": "node3"
|
|
325
|
+
}
|
|
326
|
+
}
|
|
327
|
+
}
|
|
328
|
+
},
|
|
329
|
+
"nfs1": {
|
|
330
|
+
"aws": {
|
|
331
|
+
"security_groups": [
|
|
332
|
+
"ops-admin",
|
|
333
|
+
"<%= config[:environment_name] %>-oscp-nfs"
|
|
334
|
+
]
|
|
335
|
+
<%- unless config[:provider_config][:cidr] == "none" -%>
|
|
336
|
+
,"private_ip_address": "",
|
|
337
|
+
"subnet": "1a"
|
|
338
|
+
<%- end -%>
|
|
339
|
+
},
|
|
340
|
+
"run_list": [
|
|
341
|
+
"role[ose_storage_server]"
|
|
342
|
+
],
|
|
343
|
+
"chef_attributes":{
|
|
344
|
+
"openshift":{
|
|
345
|
+
"labels":{
|
|
346
|
+
"name": "nfs1"
|
|
347
|
+
}
|
|
348
|
+
}
|
|
349
|
+
}
|
|
350
|
+
}
|
|
351
|
+
}
|
|
352
|
+
}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
"default_instance_options": {
|
|
3
3
|
"image_ref": "<%= config[:default_instance_options][:image_ref] %>",
|
|
4
4
|
"flavor_ref": "<%= config[:default_instance_options][:flavor_ref] %>",
|
|
5
|
-
"floating_ip_pool": "<%= config[:default_instance_options][:floating_ip_pool] %>"
|
|
5
|
+
"floating_ip_pool": "<%= config[:default_instance_options][:floating_ip_pool] %>",
|
|
6
|
+
"ssh_username": "<%= config[:default_instance_options][:ssh_username] %>"
|
|
6
7
|
}
|
|
7
8
|
}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
{
|
|
2
|
+
"domain": "<%= config[:domain] %>",
|
|
3
|
+
"instances": {
|
|
4
|
+
"master1": {
|
|
5
|
+
"run_list": [
|
|
6
|
+
"role[ose_master_server]"
|
|
7
|
+
],
|
|
8
|
+
"chef_attributes":{
|
|
9
|
+
"openshift":{
|
|
10
|
+
"labels":{
|
|
11
|
+
"name": "master1"
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
},
|
|
16
|
+
"node1": {
|
|
17
|
+
"run_list": [
|
|
18
|
+
"role[ose_node_server]"
|
|
19
|
+
],
|
|
20
|
+
"chef_attributes":{
|
|
21
|
+
"openshift":{
|
|
22
|
+
"labels":{
|
|
23
|
+
"name": "node1",
|
|
24
|
+
"region": "infra"
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
},
|
|
29
|
+
"node2": {
|
|
30
|
+
"run_list": [
|
|
31
|
+
"role[ose_node_server]"
|
|
32
|
+
],
|
|
33
|
+
"chef_attributes":{
|
|
34
|
+
"openshift":{
|
|
35
|
+
"labels":{
|
|
36
|
+
"name": "node2",
|
|
37
|
+
"region": "infra"
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
},
|
|
42
|
+
"node3": {
|
|
43
|
+
"run_list": [
|
|
44
|
+
"role[ose_node_server]"
|
|
45
|
+
],
|
|
46
|
+
"chef_attributes":{
|
|
47
|
+
"openshift":{
|
|
48
|
+
"labels":{
|
|
49
|
+
"name": "node3",
|
|
50
|
+
"region": "infra"
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
},
|
|
55
|
+
"nfs1": {
|
|
56
|
+
"run_list": [
|
|
57
|
+
"role[ose_storage_server]"
|
|
58
|
+
],
|
|
59
|
+
"chef_attributes":{
|
|
60
|
+
"openshift":{
|
|
61
|
+
"labels":{
|
|
62
|
+
"name": "nfs1"
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
{
|
|
2
|
+
"domain": "<%= config[:domain] %>",
|
|
3
|
+
"instances": {
|
|
4
|
+
"master1": {
|
|
5
|
+
"run_list": [
|
|
6
|
+
"role[ose_master_server]"
|
|
7
|
+
],
|
|
8
|
+
"chef_attributes":{
|
|
9
|
+
"openshift":{
|
|
10
|
+
"labels":{
|
|
11
|
+
"name": "master1"
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
},
|
|
16
|
+
"infra1": {
|
|
17
|
+
"run_list": [
|
|
18
|
+
"role[ose_node_server]"
|
|
19
|
+
],
|
|
20
|
+
"chef_attributes":{
|
|
21
|
+
"openshift":{
|
|
22
|
+
"labels":{
|
|
23
|
+
"name": "infra1",
|
|
24
|
+
"region": "infra"
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
},
|
|
29
|
+
"infra2": {
|
|
30
|
+
"run_list": [
|
|
31
|
+
"role[ose_node_server]"
|
|
32
|
+
],
|
|
33
|
+
"chef_attributes":{
|
|
34
|
+
"openshift":{
|
|
35
|
+
"labels":{
|
|
36
|
+
"name": "infra2",
|
|
37
|
+
"region": "infra"
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
},
|
|
42
|
+
"node1": {
|
|
43
|
+
"run_list": [
|
|
44
|
+
"role[ose_node_server]"
|
|
45
|
+
],
|
|
46
|
+
"chef_attributes":{
|
|
47
|
+
"openshift":{
|
|
48
|
+
"labels":{
|
|
49
|
+
"name": "node1"
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
},
|
|
54
|
+
"node2": {
|
|
55
|
+
"run_list": [
|
|
56
|
+
"role[ose_node_server]"
|
|
57
|
+
],
|
|
58
|
+
"chef_attributes":{
|
|
59
|
+
"openshift":{
|
|
60
|
+
"labels":{
|
|
61
|
+
"name": "node2"
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
},
|
|
66
|
+
"node3": {
|
|
67
|
+
"run_list": [
|
|
68
|
+
"role[ose_node_server]"
|
|
69
|
+
],
|
|
70
|
+
"chef_attributes":{
|
|
71
|
+
"openshift":{
|
|
72
|
+
"labels":{
|
|
73
|
+
"name": "node3"
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
},
|
|
78
|
+
"nfs1": {
|
|
79
|
+
"run_list": [
|
|
80
|
+
"role[ose_storage_server]"
|
|
81
|
+
],
|
|
82
|
+
"chef_attributes":{
|
|
83
|
+
"openshift":{
|
|
84
|
+
"labels":{
|
|
85
|
+
"name": "nfs1"
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
@@ -10,6 +10,10 @@ driver:
|
|
|
10
10
|
Name: test-kitchen <%= Socket.gethostname %> (<%= Etc.getlogin %>)
|
|
11
11
|
OriginHostname: <%= Socket.gethostname %>
|
|
12
12
|
OriginUsername: <%= Etc.getlogin %>
|
|
13
|
+
block_device_mappings:
|
|
14
|
+
- device_name: /dev/sda1
|
|
15
|
+
ebs:
|
|
16
|
+
delete_on_termination: true
|
|
13
17
|
|
|
14
18
|
transport:
|
|
15
19
|
name: sftp
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: fhcap-cli
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.13
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Michael Nairn
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-03
|
|
11
|
+
date: 2017-05-03 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: nokogiri
|
|
@@ -527,6 +527,7 @@ files:
|
|
|
527
527
|
- lib/fhcap/tasks/chef/environments/create.rb
|
|
528
528
|
- lib/fhcap/tasks/chef/environments/destroy.rb
|
|
529
529
|
- lib/fhcap/tasks/chef/environments/promote_cookbooks.rb
|
|
530
|
+
- lib/fhcap/tasks/chef/environments/update_attributes.rb
|
|
530
531
|
- lib/fhcap/tasks/chef/provisioning/chef_provisioning_task.rb
|
|
531
532
|
- lib/fhcap/tasks/chef/provisioning/chef_provisioning_task_base.rb
|
|
532
533
|
- lib/fhcap/tasks/chef/provisioning/create.rb
|
|
@@ -551,6 +552,7 @@ files:
|
|
|
551
552
|
- lib/fhcap/tasks/cluster/provision.rb
|
|
552
553
|
- lib/fhcap/tasks/cluster/status.rb
|
|
553
554
|
- lib/fhcap/tasks/cluster/test.rb
|
|
555
|
+
- lib/fhcap/tasks/cluster/update_environment_attributes.rb
|
|
554
556
|
- lib/fhcap/tasks/dns/aws/create_record.rb
|
|
555
557
|
- lib/fhcap/tasks/dns/aws/delete_record.rb
|
|
556
558
|
- lib/fhcap/tasks/dns/aws/list_records.rb
|
|
@@ -579,9 +581,11 @@ files:
|
|
|
579
581
|
- spec/fhcap/tasks/chef/cookbook/update_artifact_spec.rb
|
|
580
582
|
- spec/fhcap/tasks/chef/cookbook/update_config_spec.rb
|
|
581
583
|
- spec/fhcap/tasks/chef/cookbook/update_metadata_spec.rb
|
|
584
|
+
- spec/fhcap/tasks/chef/environments/update_attributes_spec.rb
|
|
582
585
|
- spec/fhcap/tasks/cluster/create_dns_records_spec.rb
|
|
583
586
|
- spec/fhcap/tasks/cluster/create_spec.rb
|
|
584
587
|
- spec/fhcap/tasks/cluster/generate_spec.rb
|
|
588
|
+
- spec/fhcap/tasks/cluster/update_environment_attributes_spec.rb
|
|
585
589
|
- spec/fhcap/tasks/dns/aws/create_record_spec.rb
|
|
586
590
|
- spec/fhcap/tasks/dns/aws/delete_record_spec.rb
|
|
587
591
|
- spec/fhcap/tasks/knife/add_spec.rb
|
|
@@ -602,7 +606,7 @@ files:
|
|
|
602
606
|
- templates/chef/environment_empty.json.erb
|
|
603
607
|
- templates/chef/environment_farm.json.erb
|
|
604
608
|
- templates/chef/environment_mbaas.json.erb
|
|
605
|
-
- templates/chef/
|
|
609
|
+
- templates/chef/environment_oscp.json.erb
|
|
606
610
|
- templates/chef/environment_ose-single.json.erb
|
|
607
611
|
- templates/chef/environment_single.json.erb
|
|
608
612
|
- templates/cluster/aws/common.json.erb
|
|
@@ -613,7 +617,8 @@ files:
|
|
|
613
617
|
- templates/cluster/aws/farm-single.json.erb
|
|
614
618
|
- templates/cluster/aws/mbaas-3node.json.erb
|
|
615
619
|
- templates/cluster/aws/nginx-test.json.erb
|
|
616
|
-
- templates/cluster/aws/
|
|
620
|
+
- templates/cluster/aws/oscp-5node.json.erb
|
|
621
|
+
- templates/cluster/aws/oscp-7node.json.erb
|
|
617
622
|
- templates/cluster/aws/ose-single.json.erb
|
|
618
623
|
- templates/cluster/aws/single-blank.json.erb
|
|
619
624
|
- templates/cluster/aws/single.json.erb
|
|
@@ -633,11 +638,13 @@ files:
|
|
|
633
638
|
- templates/cluster/openstack/farm-single.json.erb
|
|
634
639
|
- templates/cluster/openstack/mbaas-3node.json.erb
|
|
635
640
|
- templates/cluster/openstack/nginx-test.json.erb
|
|
636
|
-
- templates/cluster/openstack/
|
|
641
|
+
- templates/cluster/openstack/oscp-5node.json.erb
|
|
642
|
+
- templates/cluster/openstack/oscp-7node.json.erb
|
|
637
643
|
- templates/cluster/openstack/ose-single.json.erb
|
|
638
644
|
- templates/cluster/openstack/single-blank.json.erb
|
|
639
645
|
- templates/cluster/openstack/single.json.erb
|
|
640
|
-
- templates/cluster/
|
|
646
|
+
- templates/cluster/oscp-5node.json.erb
|
|
647
|
+
- templates/cluster/oscp-7node.json.erb
|
|
641
648
|
- templates/cluster/ose-single.json.erb
|
|
642
649
|
- templates/cluster/single-blank.json.erb
|
|
643
650
|
- templates/cluster/single.json.erb
|
|
@@ -684,9 +691,11 @@ test_files:
|
|
|
684
691
|
- spec/fhcap/tasks/chef/cookbook/update_artifact_spec.rb
|
|
685
692
|
- spec/fhcap/tasks/chef/cookbook/update_config_spec.rb
|
|
686
693
|
- spec/fhcap/tasks/chef/cookbook/update_metadata_spec.rb
|
|
694
|
+
- spec/fhcap/tasks/chef/environments/update_attributes_spec.rb
|
|
687
695
|
- spec/fhcap/tasks/cluster/create_dns_records_spec.rb
|
|
688
696
|
- spec/fhcap/tasks/cluster/create_spec.rb
|
|
689
697
|
- spec/fhcap/tasks/cluster/generate_spec.rb
|
|
698
|
+
- spec/fhcap/tasks/cluster/update_environment_attributes_spec.rb
|
|
690
699
|
- spec/fhcap/tasks/dns/aws/create_record_spec.rb
|
|
691
700
|
- spec/fhcap/tasks/dns/aws/delete_record_spec.rb
|
|
692
701
|
- spec/fhcap/tasks/knife/add_spec.rb
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"domain": "<%= config[:domain] %>",
|
|
3
|
-
"instances": {
|
|
4
|
-
"master1": {
|
|
5
|
-
"run_list": [
|
|
6
|
-
"role[ose_master_server]"
|
|
7
|
-
]
|
|
8
|
-
},
|
|
9
|
-
"node1": {
|
|
10
|
-
"run_list": [
|
|
11
|
-
"role[ose_node_server]"
|
|
12
|
-
]
|
|
13
|
-
},
|
|
14
|
-
"node2": {
|
|
15
|
-
"run_list": [
|
|
16
|
-
"role[ose_node_server]"
|
|
17
|
-
]
|
|
18
|
-
},
|
|
19
|
-
"node3": {
|
|
20
|
-
"run_list": [
|
|
21
|
-
"role[ose_node_server]"
|
|
22
|
-
]
|
|
23
|
-
},
|
|
24
|
-
"nfs1": {
|
|
25
|
-
"run_list": [
|
|
26
|
-
"role[ose_storage_server]"
|
|
27
|
-
]
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
}
|