Skip to content

Commit 2c350c8

Browse files
bwbarrettbwbarrett
committed
Merge 1.4.0 release into master
2 parents 1970335 + dc56952 commit 2c350c8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1121
-781
lines changed

‎.kitchen.cloud.yml

Lines changed: 6 additions & 342 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ provisioner:
1818
require_chef_omnibus: 12.19.36
1919

2020
platforms:
21-
- name: amazon-linux-2017-03
21+
- name: amazon-linux-latest
2222
driver_plugin: ec2
2323
driver_config:
24-
image_id: ami-c58c1dd3
24+
image_id: ami-55ef662f
2525
block_device_mappings:
2626
- device_name: /dev/xvda
2727
ebs:
@@ -79,234 +79,10 @@ platforms:
7979
transport:
8080
username: ec2-user
8181
ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
82-
- name: marketplace-centos-6-updates
83-
driver_plugin: ec2
84-
driver_config:
85-
image_id: ami-1c221e76
86-
block_device_mappings:
87-
- device_name: /dev/xvdba
88-
virtual_name: ephemeral0
89-
- device_name: /dev/xvdbb
90-
virtual_name: ephemeral1
91-
- device_name: /dev/xvdbc
92-
virtual_name: ephemeral2
93-
- device_name: /dev/xvdbd
94-
virtual_name: ephemeral3
95-
- device_name: /dev/xvdbe
96-
virtual_name: ephemeral4
97-
- device_name: /dev/xvdbf
98-
virtual_name: ephemeral5
99-
- device_name: /dev/xvdbg
100-
virtual_name: ephemeral6
101-
- device_name: /dev/xvdbh
102-
virtual_name: ephemeral7
103-
- device_name: /dev/xvdbi
104-
virtual_name: ephemeral8
105-
- device_name: /dev/xvdbj
106-
virtual_name: ephemeral9
107-
- device_name: /dev/xvdbk
108-
virtual_name: ephemeral10
109-
- device_name: /dev/xvdbl
110-
virtual_name: ephemeral11
111-
- device_name: /dev/xvdbm
112-
virtual_name: ephemeral12
113-
- device_name: /dev/xvdbn
114-
virtual_name: ephemeral13
115-
- device_name: /dev/xvdbo
116-
virtual_name: ephemeral14
117-
- device_name: /dev/xvdbp
118-
virtual_name: ephemeral15
119-
- device_name: /dev/xvdbq
120-
virtual_name: ephemeral16
121-
- device_name: /dev/xvdbr
122-
virtual_name: ephemeral17
123-
- device_name: /dev/xvdbs
124-
virtual_name: ephemeral18
125-
- device_name: /dev/xvdbt
126-
virtual_name: ephemeral19
127-
- device_name: /dev/xvdbu
128-
virtual_name: ephemeral20
129-
- device_name: /dev/xvdbv
130-
virtual_name: ephemeral21
131-
- device_name: /dev/xvdbw
132-
virtual_name: ephemeral22
133-
- device_name: /dev/xvdbx
134-
virtual_name: ephemeral23
135-
transport:
136-
username: centos
137-
ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
138-
- name: marketplace-centos-7-updates
139-
driver_plugin: ec2
140-
driver_config:
141-
image_id: ami-6d1c2007
142-
block_device_mappings:
143-
- device_name: /dev/xvdba
144-
virtual_name: ephemeral0
145-
- device_name: /dev/xvdbb
146-
virtual_name: ephemeral1
147-
- device_name: /dev/xvdbc
148-
virtual_name: ephemeral2
149-
- device_name: /dev/xvdbd
150-
virtual_name: ephemeral3
151-
- device_name: /dev/xvdbe
152-
virtual_name: ephemeral4
153-
- device_name: /dev/xvdbf
154-
virtual_name: ephemeral5
155-
- device_name: /dev/xvdbg
156-
virtual_name: ephemeral6
157-
- device_name: /dev/xvdbh
158-
virtual_name: ephemeral7
159-
- device_name: /dev/xvdbi
160-
virtual_name: ephemeral8
161-
- device_name: /dev/xvdbj
162-
virtual_name: ephemeral9
163-
- device_name: /dev/xvdbk
164-
virtual_name: ephemeral10
165-
- device_name: /dev/xvdbl
166-
virtual_name: ephemeral11
167-
- device_name: /dev/xvdbm
168-
virtual_name: ephemeral12
169-
- device_name: /dev/xvdbn
170-
virtual_name: ephemeral13
171-
- device_name: /dev/xvdbo
172-
virtual_name: ephemeral14
173-
- device_name: /dev/xvdbp
174-
virtual_name: ephemeral15
175-
- device_name: /dev/xvdbq
176-
virtual_name: ephemeral16
177-
- device_name: /dev/xvdbr
178-
virtual_name: ephemeral17
179-
- device_name: /dev/xvdbs
180-
virtual_name: ephemeral18
181-
- device_name: /dev/xvdbt
182-
virtual_name: ephemeral19
183-
- device_name: /dev/xvdbu
184-
virtual_name: ephemeral20
185-
- device_name: /dev/xvdbv
186-
virtual_name: ephemeral21
187-
- device_name: /dev/xvdbw
188-
virtual_name: ephemeral22
189-
- device_name: /dev/xvdbx
190-
virtual_name: ephemeral23
191-
transport:
192-
username: centos
193-
ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
194-
- name: rhel-6-7-HVM-GA-20160219
195-
driver_plugin: ec2
196-
driver_config:
197-
image_id: ami-f37b4b99
198-
block_device_mappings:
199-
- device_name: /dev/xvdba
200-
virtual_name: ephemeral0
201-
- device_name: /dev/xvdbb
202-
virtual_name: ephemeral1
203-
- device_name: /dev/xvdbc
204-
virtual_name: ephemeral2
205-
- device_name: /dev/xvdbd
206-
virtual_name: ephemeral3
207-
- device_name: /dev/xvdbe
208-
virtual_name: ephemeral4
209-
- device_name: /dev/xvdbf
210-
virtual_name: ephemeral5
211-
- device_name: /dev/xvdbg
212-
virtual_name: ephemeral6
213-
- device_name: /dev/xvdbh
214-
virtual_name: ephemeral7
215-
- device_name: /dev/xvdbi
216-
virtual_name: ephemeral8
217-
- device_name: /dev/xvdbj
218-
virtual_name: ephemeral9
219-
- device_name: /dev/xvdbk
220-
virtual_name: ephemeral10
221-
- device_name: /dev/xvdbl
222-
virtual_name: ephemeral11
223-
- device_name: /dev/xvdbm
224-
virtual_name: ephemeral12
225-
- device_name: /dev/xvdbn
226-
virtual_name: ephemeral13
227-
- device_name: /dev/xvdbo
228-
virtual_name: ephemeral14
229-
- device_name: /dev/xvdbp
230-
virtual_name: ephemeral15
231-
- device_name: /dev/xvdbq
232-
virtual_name: ephemeral16
233-
- device_name: /dev/xvdbr
234-
virtual_name: ephemeral17
235-
- device_name: /dev/xvdbs
236-
virtual_name: ephemeral18
237-
- device_name: /dev/xvdbt
238-
virtual_name: ephemeral19
239-
- device_name: /dev/xvdbu
240-
virtual_name: ephemeral20
241-
- device_name: /dev/xvdbv
242-
virtual_name: ephemeral21
243-
- device_name: /dev/xvdbw
244-
virtual_name: ephemeral22
245-
- device_name: /dev/xvdbx
246-
virtual_name: ephemeral23
247-
transport:
248-
username: ec2-user
249-
ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
250-
- name: rhel-7-2-HVM-GA
251-
driver_plugin: ec2
252-
driver_config:
253-
image_id: ami-2051294a
254-
block_device_mappings:
255-
- device_name: /dev/xvdba
256-
virtual_name: ephemeral0
257-
- device_name: /dev/xvdbb
258-
virtual_name: ephemeral1
259-
- device_name: /dev/xvdbc
260-
virtual_name: ephemeral2
261-
- device_name: /dev/xvdbd
262-
virtual_name: ephemeral3
263-
- device_name: /dev/xvdbe
264-
virtual_name: ephemeral4
265-
- device_name: /dev/xvdbf
266-
virtual_name: ephemeral5
267-
- device_name: /dev/xvdbg
268-
virtual_name: ephemeral6
269-
- device_name: /dev/xvdbh
270-
virtual_name: ephemeral7
271-
- device_name: /dev/xvdbi
272-
virtual_name: ephemeral8
273-
- device_name: /dev/xvdbj
274-
virtual_name: ephemeral9
275-
- device_name: /dev/xvdbk
276-
virtual_name: ephemeral10
277-
- device_name: /dev/xvdbl
278-
virtual_name: ephemeral11
279-
- device_name: /dev/xvdbm
280-
virtual_name: ephemeral12
281-
- device_name: /dev/xvdbn
282-
virtual_name: ephemeral13
283-
- device_name: /dev/xvdbo
284-
virtual_name: ephemeral14
285-
- device_name: /dev/xvdbp
286-
virtual_name: ephemeral15
287-
- device_name: /dev/xvdbq
288-
virtual_name: ephemeral16
289-
- device_name: /dev/xvdbr
290-
virtual_name: ephemeral17
291-
- device_name: /dev/xvdbs
292-
virtual_name: ephemeral18
293-
- device_name: /dev/xvdbt
294-
virtual_name: ephemeral19
295-
- device_name: /dev/xvdbu
296-
virtual_name: ephemeral20
297-
- device_name: /dev/xvdbv
298-
virtual_name: ephemeral21
299-
- device_name: /dev/xvdbw
300-
virtual_name: ephemeral22
301-
- device_name: /dev/xvdbx
302-
virtual_name: ephemeral23
303-
transport:
304-
username: ec2-user
305-
ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
30682
- name: centos-6-minimal
30783
driver_plugin: ec2
30884
driver_config:
309-
image_id: ami-b7c484a0
85+
image_id: ami-9ff841e5
31086
block_device_mappings:
31187
- device_name: /dev/sda1
31288
ebs:
@@ -367,7 +143,7 @@ platforms:
367143
- name: centos-7-minimal
368144
driver_plugin: ec2
369145
driver_config:
370-
image_id: ami-9dc3838a
146+
image_id: ami-01098c7b
371147
block_device_mappings:
372148
- device_name: /dev/sda1
373149
ebs:
@@ -428,7 +204,7 @@ platforms:
428204
- name: ubuntu-14-04-lts
429205
driver_plugin: ec2
430206
driver_config:
431-
image_id: ami-2ac4843d
207+
image_id: ami-c29e1cb8
432208
block_device_mappings:
433209
- device_name: /dev/sda1
434210
ebs:
@@ -489,7 +265,7 @@ platforms:
489265
- name: ubuntu-16-04-lts
490266
driver_plugin: ec2
491267
driver_config:
492-
image_id: ami-45c18152
268+
image_id: ami-aa2ea6d0
493269
block_device_mappings:
494270
- device_name: /dev/sda1
495271
ebs:
@@ -547,115 +323,3 @@ platforms:
547323
transport:
548324
username: ubuntu
549325
ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
550-
- name: sles11
551-
driver_plugin: ec2
552-
driver_config:
553-
image_id: ami-3bf32750
554-
block_device_mappings:
555-
- device_name: /dev/xvdba
556-
virtual_name: ephemeral0
557-
- device_name: /dev/xvdbb
558-
virtual_name: ephemeral1
559-
- device_name: /dev/xvdbc
560-
virtual_name: ephemeral2
561-
- device_name: /dev/xvdbd
562-
virtual_name: ephemeral3
563-
- device_name: /dev/xvdbe
564-
virtual_name: ephemeral4
565-
- device_name: /dev/xvdbf
566-
virtual_name: ephemeral5
567-
- device_name: /dev/xvdbg
568-
virtual_name: ephemeral6
569-
- device_name: /dev/xvdbh
570-
virtual_name: ephemeral7
571-
- device_name: /dev/xvdbi
572-
virtual_name: ephemeral8
573-
- device_name: /dev/xvdbj
574-
virtual_name: ephemeral9
575-
- device_name: /dev/xvdbk
576-
virtual_name: ephemeral10
577-
- device_name: /dev/xvdbl
578-
virtual_name: ephemeral11
579-
- device_name: /dev/xvdbm
580-
virtual_name: ephemeral12
581-
- device_name: /dev/xvdbn
582-
virtual_name: ephemeral13
583-
- device_name: /dev/xvdbo
584-
virtual_name: ephemeral14
585-
- device_name: /dev/xvdbp
586-
virtual_name: ephemeral15
587-
- device_name: /dev/xvdbq
588-
virtual_name: ephemeral16
589-
- device_name: /dev/xvdbr
590-
virtual_name: ephemeral17
591-
- device_name: /dev/xvdbs
592-
virtual_name: ephemeral18
593-
- device_name: /dev/xvdbt
594-
virtual_name: ephemeral19
595-
- device_name: /dev/xvdbu
596-
virtual_name: ephemeral20
597-
- device_name: /dev/xvdbv
598-
virtual_name: ephemeral21
599-
- device_name: /dev/xvdbw
600-
virtual_name: ephemeral22
601-
- device_name: /dev/xvdbx
602-
virtual_name: ephemeral23
603-
transport:
604-
username: ec2-user
605-
ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
606-
- name: sles12
607-
driver_plugin: ec2
608-
driver_config:
609-
image_id: ami-b7b4fedd
610-
block_device_mappings:
611-
- device_name: /dev/xvdba
612-
virtual_name: ephemeral0
613-
- device_name: /dev/xvdbb
614-
virtual_name: ephemeral1
615-
- device_name: /dev/xvdbc
616-
virtual_name: ephemeral2
617-
- device_name: /dev/xvdbd
618-
virtual_name: ephemeral3
619-
- device_name: /dev/xvdbe
620-
virtual_name: ephemeral4
621-
- device_name: /dev/xvdbf
622-
virtual_name: ephemeral5
623-
- device_name: /dev/xvdbg
624-
virtual_name: ephemeral6
625-
- device_name: /dev/xvdbh
626-
virtual_name: ephemeral7
627-
- device_name: /dev/xvdbi
628-
virtual_name: ephemeral8
629-
- device_name: /dev/xvdbj
630-
virtual_name: ephemeral9
631-
- device_name: /dev/xvdbk
632-
virtual_name: ephemeral10
633-
- device_name: /dev/xvdbl
634-
virtual_name: ephemeral11
635-
- device_name: /dev/xvdbm
636-
virtual_name: ephemeral12
637-
- device_name: /dev/xvdbn
638-
virtual_name: ephemeral13
639-
- device_name: /dev/xvdbo
640-
virtual_name: ephemeral14
641-
- device_name: /dev/xvdbp
642-
virtual_name: ephemeral15
643-
- device_name: /dev/xvdbq
644-
virtual_name: ephemeral16
645-
- device_name: /dev/xvdbr
646-
virtual_name: ephemeral17
647-
- device_name: /dev/xvdbs
648-
virtual_name: ephemeral18
649-
- device_name: /dev/xvdbt
650-
virtual_name: ephemeral19
651-
- device_name: /dev/xvdbu
652-
virtual_name: ephemeral20
653-
- device_name: /dev/xvdbv
654-
virtual_name: ephemeral21
655-
- device_name: /dev/xvdbw
656-
virtual_name: ephemeral22
657-
- device_name: /dev/xvdbx
658-
virtual_name: ephemeral23
659-
transport:
660-
username: root
661-
ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>

0 commit comments

Comments
 (0)