fhcap-cli 0.4.13 → 0.4.14

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +13 -1
  3. data/Jenkinsfile +26 -0
  4. data/lib/fhcap/cli.rb +2 -0
  5. data/lib/fhcap/component.rb +3 -3
  6. data/lib/fhcap/config.rb +12 -0
  7. data/lib/fhcap/cookbook.rb +42 -2
  8. data/lib/fhcap/misc.rb +8 -1
  9. data/lib/fhcap/repo.rb +1 -1
  10. data/lib/fhcap/repos_helper.rb +11 -0
  11. data/lib/fhcap/tasks/chef/cookbook/aws/s3_helper.rb +21 -0
  12. data/lib/fhcap/tasks/chef/cookbook/check_bumps.rb +109 -0
  13. data/lib/fhcap/tasks/chef/cookbook/list_artifacts.rb +73 -17
  14. data/lib/fhcap/tasks/chef/cookbook/update_attribute.rb +51 -0
  15. data/lib/fhcap/tasks/chef/environments/create.rb +3 -1
  16. data/lib/fhcap/tasks/cluster/create_environment.rb +4 -3
  17. data/lib/fhcap/tasks/misc/platform_bump.rb +36 -0
  18. data/lib/fhcap/tasks/repo/add.rb +4 -6
  19. data/lib/fhcap/tasks/setup.rb +7 -1
  20. data/lib/fhcap/version.rb +1 -1
  21. data/lib/fhcap.rb +1 -1
  22. data/spec/fhcap/tasks/chef/cookbook/check_bumps_spec.rb +33 -0
  23. data/templates/chef/{environment_oscp.json.erb → environment_ocp.json.erb} +16 -1
  24. data/templates/chef/environment_ose-single.json.erb +1 -1
  25. data/templates/cluster/aws/common.json.erb +22 -23
  26. data/templates/cluster/aws/{oscp-7node.json.erb → ocp-multi-infra.json.erb} +64 -51
  27. data/templates/cluster/aws/{oscp-5node.json.erb → ocp-multi.json.erb} +47 -59
  28. data/templates/cluster/ocp-multi-infra.json.erb +8 -0
  29. data/templates/cluster/ocp-multi.json.erb +8 -0
  30. data/templates/cluster/openstack/{oscp-7node.json.erb → ocp-multi-infra.json.erb} +0 -0
  31. data/templates/cluster/openstack/{oscp-5node.json.erb → ocp-multi.json.erb} +0 -0
  32. metadata +16 -9
  33. data/templates/cluster/oscp-5node.json.erb +0 -8
  34. data/templates/cluster/oscp-7node.json.erb +0 -8
data/templates/cluster/aws/{oscp-5node.json.erb → ocp-multi.json.erb} RENAMED
@@ -21,7 +21,7 @@
21
21
  },
22
22
  <%- end -%>
23
23
  "security_groups": {
24
- "<%= config[:environment_name] %>-oscp-master": {
24
+ "<%= config[:environment_name] %>-ocp-master": {
25
25
  "authorize_ingress": [
26
26
  {
27
27
  "protocols": [
@@ -30,9 +30,9 @@
30
30
  "start": 0,
31
31
  "end": 65535,
32
32
  "groups": [
33
- "<%= config[:environment_name] %>-oscp-master",
34
- "<%= config[:environment_name] %>-oscp-node",
35
- "<%= config[:environment_name] %>-oscp-nfs"
33
+ "<%= config[:environment_name] %>-ocp-master",
34
+ "<%= config[:environment_name] %>-ocp-node",
35
+ "<%= config[:environment_name] %>-ocp-nfs"
36
36
  ]
37
37
  },
38
38
  {
@@ -42,9 +42,9 @@
42
42
  "start": -1,
43
43
  "end": -1,
44
44
  "groups": [
45
- "<%= config[:environment_name] %>-oscp-master",
46
- "<%= config[:environment_name] %>-oscp-node",
47
- "<%= config[:environment_name] %>-oscp-nfs"
45
+ "<%= config[:environment_name] %>-ocp-master",
46
+ "<%= config[:environment_name] %>-ocp-node",
47
+ "<%= config[:environment_name] %>-ocp-nfs"
48
48
  ]
49
49
  },
50
50
  {
@@ -59,7 +59,7 @@
59
59
  }
60
60
  ]
61
61
  },
62
- "<%= config[:environment_name] %>-oscp-node": {
62
+ "<%= config[:environment_name] %>-ocp-node": {
63
63
  "authorize_ingress": [
64
64
  {
65
65
  "protocols": [
@@ -68,10 +68,10 @@
68
68
  "start": 0,
69
69
  "end": 65535,
70
70
  "groups": [
71
- "<%= config[:environment_name] %>-oscp-master",
72
- "<%= config[:environment_name] %>-oscp-node",
73
- "<%= config[:environment_name] %>-oscp-lb",
74
- "<%= config[:environment_name] %>-oscp-nfs"
71
+ "<%= config[:environment_name] %>-ocp-master",
72
+ "<%= config[:environment_name] %>-ocp-node",
73
+ "<%= config[:environment_name] %>-ocp-lb",
74
+ "<%= config[:environment_name] %>-ocp-nfs"
75
75
  ]
76
76
  },
77
77
  {
@@ -81,15 +81,15 @@
81
81
  "start": -1,
82
82
  "end": -1,
83
83
  "groups": [
84
- "<%= config[:environment_name] %>-oscp-master",
85
- "<%= config[:environment_name] %>-oscp-node",
86
- "<%= config[:environment_name] %>-oscp-lb",
87
- "<%= config[:environment_name] %>-oscp-nfs"
84
+ "<%= config[:environment_name] %>-ocp-master",
85
+ "<%= config[:environment_name] %>-ocp-node",
86
+ "<%= config[:environment_name] %>-ocp-lb",
87
+ "<%= config[:environment_name] %>-ocp-nfs"
88
88
  ]
89
89
  }
90
90
  ]
91
91
  },
92
- "<%= config[:environment_name] %>-oscp-lb": {
92
+ "<%= config[:environment_name] %>-ocp-lb": {
93
93
  "authorize_ingress": [
94
94
  {
95
95
  "protocols": [
@@ -100,10 +100,20 @@
100
100
  "sources": [
101
101
  "0.0.0.0/0"
102
102
  ]
103
+ },
104
+ {
105
+ "protocols": [
106
+ "tcp"
107
+ ],
108
+ "start": 443,
109
+ "end": 443,
110
+ "sources": [
111
+ "0.0.0.0/0"
112
+ ]
103
113
  }
104
114
  ]
105
115
  },
106
- "<%= config[:environment_name] %>-oscp-nfs": {
116
+ "<%= config[:environment_name] %>-ocp-nfs": {
107
117
  "authorize_ingress": [
108
118
  {
109
119
  "protocols": [
@@ -112,9 +122,9 @@
112
122
  "start": 0,
113
123
  "end": 65535,
114
124
  "groups": [
115
- "<%= config[:environment_name] %>-oscp-master",
116
- "<%= config[:environment_name] %>-oscp-node",
117
- "<%= config[:environment_name] %>-oscp-nfs"
125
+ "<%= config[:environment_name] %>-ocp-master",
126
+ "<%= config[:environment_name] %>-ocp-node",
127
+ "<%= config[:environment_name] %>-ocp-nfs"
118
128
  ]
119
129
  },
120
130
  {
@@ -124,17 +134,17 @@
124
134
  "start": -1,
125
135
  "end": -1,
126
136
  "groups": [
127
- "<%= config[:environment_name] %>-oscp-master",
128
- "<%= config[:environment_name] %>-oscp-node",
129
- "<%= config[:environment_name] %>-oscp-lb"
137
+ "<%= config[:environment_name] %>-ocp-master",
138
+ "<%= config[:environment_name] %>-ocp-node",
139
+ "<%= config[:environment_name] %>-ocp-lb"
130
140
  ]
131
141
  }
132
142
  ]
133
143
  }
134
144
  },
135
145
  "load_balancers": {
136
- "oscp-lb": {
137
- "security_groups": ["<%= config[:environment_name] %>-oscp-lb"],
146
+ "ocp-lb": {
147
+ "security_groups": ["<%= config[:environment_name] %>-ocp-lb"],
138
148
  "subnets": ["1a", "1b", "1c"],
139
149
  "scheme": "internet-facing",
140
150
  "listeners": [
@@ -150,10 +160,10 @@
150
160
  "instances": {
151
161
  "master1": {
152
162
  "aws": {
153
- "instance_type": "m3.large",
163
+ "instance_type": "m3.medium",
154
164
  "security_groups": [
155
165
  "ops-admin",
156
- "<%= config[:environment_name] %>-oscp-master"
166
+ "<%= config[:environment_name] %>-ocp-master"
157
167
  ]
158
168
  <%- unless config[:provider_config][:cidr] == "none" -%>
159
169
  ,"private_ip_address": "",
@@ -176,7 +186,7 @@
176
186
  "instance_type": "m3.xlarge",
177
187
  "security_groups": [
178
188
  "ops-admin",
179
- "<%= config[:environment_name] %>-oscp-node"
189
+ "<%= config[:environment_name] %>-ocp-node"
180
190
  ]
181
191
  <%- unless config[:provider_config][:cidr] == "none" -%>
182
192
  ,"private_ip_address": "",
@@ -186,7 +196,7 @@
186
196
  "run_list": [
187
197
  "role[ose_node_server]"
188
198
  ],
189
- "load_balancers": ["oscp-lb"],
199
+ "load_balancers": ["ocp-lb"],
190
200
  "chef_attributes":{
191
201
  "openshift":{
192
202
  "labels":{
@@ -201,7 +211,7 @@
201
211
  "instance_type": "m3.xlarge",
202
212
  "security_groups": [
203
213
  "ops-admin",
204
- "<%= config[:environment_name] %>-oscp-node"
214
+ "<%= config[:environment_name] %>-ocp-node"
205
215
  ]
206
216
  <%- unless config[:provider_config][:cidr] == "none" -%>
207
217
  ,"private_ip_address": "",
@@ -211,7 +221,7 @@
211
221
  "run_list": [
212
222
  "role[ose_node_server]"
213
223
  ],
214
- "load_balancers": ["oscp-lb"],
224
+ "load_balancers": ["ocp-lb"],
215
225
  "chef_attributes":{
216
226
  "openshift":{
217
227
  "labels": {
@@ -220,37 +230,14 @@
220
230
  }
221
231
  }
222
232
  }
223
- },
224
- "node3": {
225
- "aws": {
226
- "instance_type": "m3.xlarge",
227
- "security_groups": [
228
- "ops-admin",
229
- "<%= config[:environment_name] %>-oscp-node"
230
- ]
231
- <%- unless config[:provider_config][:cidr] == "none" -%>
232
- ,"private_ip_address": "",
233
- "subnet": "1c"
234
- <%- end -%>
235
- },
236
- "run_list": [
237
- "role[ose_node_server]"
238
- ],
239
- "load_balancers": ["oscp-lb"],
240
- "chef_attributes":{
241
- "openshift":{
242
- "labels": {
243
- "name": "node3",
244
- "region": "infra"
245
- }
246
- }
247
- }
248
- },
233
+ }
234
+ <%- unless config[:provider_config][:efs_enabled] -%>
235
+ ,
249
236
  "nfs1": {
250
237
  "aws": {
251
238
  "security_groups": [
252
239
  "ops-admin",
253
- "<%= config[:environment_name] %>-oscp-nfs"
240
+ "<%= config[:environment_name] %>-ocp-nfs"
254
241
  ]
255
242
  <%- unless config[:provider_config][:cidr] == "none" -%>
256
243
  ,"private_ip_address": "",
@@ -268,5 +255,6 @@
268
255
  }
269
256
  }
270
257
  }
258
+ <%- end -%>
271
259
  }
272
260
  }
data/templates/cluster/ocp-multi-infra.json.erb ADDED
@@ -0,0 +1,8 @@
1
+ {
2
+ "environments": [
3
+ {
4
+ "name": "ocp-multi-infra",
5
+ "template": "ocp-multi-infra"
6
+ }
7
+ ]
8
+ }
data/templates/cluster/ocp-multi.json.erb ADDED
@@ -0,0 +1,8 @@
1
+ {
2
+ "environments": [
3
+ {
4
+ "name": "ocp-multi",
5
+ "template": "ocp-multi"
6
+ }
7
+ ]
8
+ }
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.13
4
+ version: 0.4.14
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-05-03 00:00:00.000000000 Z
11
+ date: 2017-09-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: nokogiri
@@ -444,6 +444,7 @@ files:
444
444
  - CHANGELOG.md
445
445
  - Dockerfile
446
446
  - Gemfile
447
+ - Jenkinsfile
447
448
  - LICENSE.txt
448
449
  - README.md
449
450
  - Rakefile
@@ -517,9 +518,12 @@ files:
517
518
  - lib/fhcap/tasks/chef/chef_task_base.rb
518
519
  - lib/fhcap/tasks/chef/chef_zero_server.rb
519
520
  - lib/fhcap/tasks/chef/cookbook/archive.rb
521
+ - lib/fhcap/tasks/chef/cookbook/aws/s3_helper.rb
522
+ - lib/fhcap/tasks/chef/cookbook/check_bumps.rb
520
523
  - lib/fhcap/tasks/chef/cookbook/list.rb
521
524
  - lib/fhcap/tasks/chef/cookbook/list_artifacts.rb
522
525
  - lib/fhcap/tasks/chef/cookbook/update_artifact.rb
526
+ - lib/fhcap/tasks/chef/cookbook/update_attribute.rb
523
527
  - lib/fhcap/tasks/chef/cookbook/update_config.rb
524
528
  - lib/fhcap/tasks/chef/cookbook/update_metadata.rb
525
529
  - lib/fhcap/tasks/chef/cookbook/update_readme.rb
@@ -564,6 +568,7 @@ files:
564
568
  - lib/fhcap/tasks/knife/list.rb
565
569
  - lib/fhcap/tasks/knife/remove.rb
566
570
  - lib/fhcap/tasks/misc/create_ssl_cert.rb
571
+ - lib/fhcap/tasks/misc/platform_bump.rb
567
572
  - lib/fhcap/tasks/provider/add.rb
568
573
  - lib/fhcap/tasks/provider/list.rb
569
574
  - lib/fhcap/tasks/provider/remove.rb
@@ -577,6 +582,7 @@ files:
577
582
  - lib/fhcap/version.rb
578
583
  - spec/fhcap/cli_spec.rb
579
584
  - spec/fhcap/tasks/chef/cookbook/archive_spec.rb
585
+ - spec/fhcap/tasks/chef/cookbook/check_bumps_spec.rb
580
586
  - spec/fhcap/tasks/chef/cookbook/list_artifacts_spec.rb
581
587
  - spec/fhcap/tasks/chef/cookbook/update_artifact_spec.rb
582
588
  - spec/fhcap/tasks/chef/cookbook/update_config_spec.rb
@@ -606,7 +612,7 @@ files:
606
612
  - templates/chef/environment_empty.json.erb
607
613
  - templates/chef/environment_farm.json.erb
608
614
  - templates/chef/environment_mbaas.json.erb
609
- - templates/chef/environment_oscp.json.erb
615
+ - templates/chef/environment_ocp.json.erb
610
616
  - templates/chef/environment_ose-single.json.erb
611
617
  - templates/chef/environment_single.json.erb
612
618
  - templates/cluster/aws/common.json.erb
@@ -617,8 +623,8 @@ files:
617
623
  - templates/cluster/aws/farm-single.json.erb
618
624
  - templates/cluster/aws/mbaas-3node.json.erb
619
625
  - templates/cluster/aws/nginx-test.json.erb
620
- - templates/cluster/aws/oscp-5node.json.erb
621
- - templates/cluster/aws/oscp-7node.json.erb
626
+ - templates/cluster/aws/ocp-multi-infra.json.erb
627
+ - templates/cluster/aws/ocp-multi.json.erb
622
628
  - templates/cluster/aws/ose-single.json.erb
623
629
  - templates/cluster/aws/single-blank.json.erb
624
630
  - templates/cluster/aws/single.json.erb
@@ -630,6 +636,8 @@ files:
630
636
  - templates/cluster/farm-single.json.erb
631
637
  - templates/cluster/mbaas-3node.json.erb
632
638
  - templates/cluster/nginx-test.json.erb
639
+ - templates/cluster/ocp-multi-infra.json.erb
640
+ - templates/cluster/ocp-multi.json.erb
633
641
  - templates/cluster/openstack/common.json.erb
634
642
  - templates/cluster/openstack/core-3node.json.erb
635
643
  - templates/cluster/openstack/core-small-9node.json.erb
@@ -638,13 +646,11 @@ files:
638
646
  - templates/cluster/openstack/farm-single.json.erb
639
647
  - templates/cluster/openstack/mbaas-3node.json.erb
640
648
  - templates/cluster/openstack/nginx-test.json.erb
641
- - templates/cluster/openstack/oscp-5node.json.erb
642
- - templates/cluster/openstack/oscp-7node.json.erb
649
+ - templates/cluster/openstack/ocp-multi-infra.json.erb
650
+ - templates/cluster/openstack/ocp-multi.json.erb
643
651
  - templates/cluster/openstack/ose-single.json.erb
644
652
  - templates/cluster/openstack/single-blank.json.erb
645
653
  - templates/cluster/openstack/single.json.erb
646
- - templates/cluster/oscp-5node.json.erb
647
- - templates/cluster/oscp-7node.json.erb
648
654
  - templates/cluster/ose-single.json.erb
649
655
  - templates/cluster/single-blank.json.erb
650
656
  - templates/cluster/single.json.erb
@@ -687,6 +693,7 @@ summary: FHCAP Command Line Tool
687
693
  test_files:
688
694
  - spec/fhcap/cli_spec.rb
689
695
  - spec/fhcap/tasks/chef/cookbook/archive_spec.rb
696
+ - spec/fhcap/tasks/chef/cookbook/check_bumps_spec.rb
690
697
  - spec/fhcap/tasks/chef/cookbook/list_artifacts_spec.rb
691
698
  - spec/fhcap/tasks/chef/cookbook/update_artifact_spec.rb
692
699
  - spec/fhcap/tasks/chef/cookbook/update_config_spec.rb
data/templates/cluster/oscp-5node.json.erb DELETED
@@ -1,8 +0,0 @@
1
- {
2
- "environments": [
3
- {
4
- "name": "oscp-5node",
5
- "template": "oscp-5node"
6
- }
7
- ]
8
- }
data/templates/cluster/oscp-7node.json.erb DELETED
@@ -1,8 +0,0 @@
1
- {
2
- "environments": [
3
- {
4
- "name": "oscp-7node",
5
- "template": "oscp-7node"
6
- }
7
- ]
8
- }