diff options
| author | John Keiser <john@johnkeiser.com> | 2016-01-26 09:42:47 -0800 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-01-26 09:44:20 -0800 |
| commit | caaf6c0597fa4fd409e080eb77f0665e3d99e41f (patch) | |
| tree | 201ab9dd99bddfaa21682313809464e8a2b13526 | |
| parent | 5a41029c3711eb8b6fb9106f16ee630e5fbb46a7 (diff) | |
| download | chef-caaf6c0597fa4fd409e080eb77f0665e3d99e41f.tar.gz | |
Remove OS's we don't support in chef
| -rw-r--r-- | acceptance/cookbook-git/.kitchen.ec2.yml | 96 | ||||
| -rw-r--r-- | acceptance/cookbook-git/.kitchen.vagrant.yml | 11 |
2 files changed, 54 insertions, 53 deletions
diff --git a/acceptance/cookbook-git/.kitchen.ec2.yml b/acceptance/cookbook-git/.kitchen.ec2.yml index adfd108383..a63dbb2cce 100644 --- a/acceptance/cookbook-git/.kitchen.ec2.yml +++ b/acceptance/cookbook-git/.kitchen.ec2.yml @@ -96,18 +96,18 @@ platforms: instance_type: t2.micro transport: username: ubuntu - - name: ubuntu-12.04 - driver: - image_search: - name: ubuntu/images/*/ubuntu-*-12.04-*-server-* - owner-id: 099720109477 - architecture: x86_64 - virtualization-type: hvm - block-device-mapping.volume-type: gp2 - image-type: machine - instance_type: t2.micro - transport: - username: ubuntu + # - name: ubuntu-12.04 + # driver: + # image_search: + # name: ubuntu/images/*/ubuntu-*-12.04-*-server-* + # owner-id: 099720109477 + # architecture: x86_64 + # virtualization-type: hvm + # block-device-mapping.volume-type: gp2 + # image-type: machine + # instance_type: t2.micro + # transport: + # username: ubuntu # # Red Hat Enterprise Linux # @@ -174,18 +174,18 @@ platforms: instance_type: t2.micro transport: username: ec2-user - - name: freebsd-8 - driver: - image_search: - name: FreeBSD/EC2 8.*-RELEASE* - owner-id: 118940168514 - architecture: x86_64 - virtualization-type: hvm - block-device-mapping.volume-type: standard - image-type: machine - instance_type: t2.micro - transport: - username: ec2-user + # - name: freebsd-8 + # driver: + # image_search: + # name: FreeBSD/EC2 8.*-RELEASE* + # owner-id: 118940168514 + # architecture: x86_64 + # virtualization-type: hvm + # block-device-mapping.volume-type: standard + # image-type: machine + # instance_type: t2.micro + # transport: + # username: ec2-user # # OS/X # @@ -261,30 +261,30 @@ platforms: # # Centos # - - name: centos-7 - driver: - image_search: - name: CentOS Linux 7 * - owner-alias: aws-marketplace - architecture: x86_64 - virtualization-type: hvm - block-device-mapping.volume-type: standard - image-type: machine - instance_type: t2.micro - transport: - username: root - - name: centos-6 - driver: - image_search: - name: CentOS-6.5-GA-* - owner-alias: aws-marketplace - architecture: x86_64 - virtualization-type: paravirtual - block-device-mapping.volume-type: standard - image-type: machine - instance_type: t1.micro - transport: - username: root + # - name: centos-7 + # driver: + # image_search: + # name: CentOS Linux 7 * + # owner-alias: aws-marketplace + # architecture: x86_64 + # virtualization-type: hvm + # block-device-mapping.volume-type: standard + # image-type: machine + # instance_type: t2.micro + # transport: + # username: root + # - name: centos-6 + # driver: + # image_search: + # name: CentOS-6.5-GA-* + # owner-alias: aws-marketplace + # architecture: x86_64 + # virtualization-type: paravirtual + # block-device-mapping.volume-type: standard + # image-type: machine + # instance_type: t1.micro + # transport: + # username: root # # Fedora # diff --git a/acceptance/cookbook-git/.kitchen.vagrant.yml b/acceptance/cookbook-git/.kitchen.vagrant.yml index 55d3161bc9..0dc8b11dc1 100644 --- a/acceptance/cookbook-git/.kitchen.vagrant.yml +++ b/acceptance/cookbook-git/.kitchen.vagrant.yml @@ -6,20 +6,17 @@ driver: memory: 1024 platforms: -<% %w(debian-8 +<% %w( +debian-8 debian-7 debian-6 ubuntu-15.10 ubuntu-14.04 -ubuntu-12.04 el-7 el-6 el-5 freebsd-10 freebsd-9 -freebsd-8 -centos-7 -centos-6 fedora-21 ).each do |platform| %> - name: <%= platform %> @@ -27,6 +24,10 @@ fedora-21 box: opscode-<%= platform %> box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_<%= platform %>_chef-provisionerless.box <% end %> +# freebsd-8 +# ubuntu-12.04 +# centos-7 +# centos-6 <% %w( 2012r2 |