Merge commit '8f09552fff04535f8f57e3ab423d45784fad1313' into prl-custom

* commit '8f09552fff04535f8f57e3ab423d45784fad1313': Fixes chef#325, chef#318 - don't download cacert.pem change mirror to http.debian.net, fixes chef#322 Fix minor typo in vm_name. update to debian 7.8 Added links to Fedora 21 boxes Update to Ubuntu 14.04.1. Fixes chef#290 Change company domain name to chef.io Update travis.yml for opscode to chef org rename Added Fedora 21 VB base boxes to README Remove EOL Fedora 19 content Fedora 19 is EOL as of January 6, 2015. https://lists.fedoraproject.org/pipermail/announce/2015-January/003248.html Make script zypper-locks.sh workable Conflicts: packer/debian-7.8-amd64.json packer/debian-7.8-i386.json
legal90 · Feb 26, 2015 · b24e3e3 · b24e3e3
2 parents b0acd7b + 8f09552
commit b24e3e3
Show file tree

Hide file tree

Showing 17 changed files with 73 additions and 390 deletions.
diff --git a/OLD-BOXES.md b/OLD-BOXES.md
@@ -18,8 +18,12 @@ Boxes for obsolete operating systems will be placed here.
 * [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.2.0_chef-provisionerless.box)
 * [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6-i386_chef-provisionerless.box)
 * [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.6_chef-provisionerless.box)
+* [opscode-debian-7.7-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.7-i386_chef-provisionerless.box)
+* [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.7_chef-provisionerless.box)
 * [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18-i386_chef-provisionerless.box)
 * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-18_chef-provisionerless.box)
+* [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19-i386_chef-provisionerless.box)
+* [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19_chef-provisionerless.box)
 * [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2-i386_chef-provisionerless.box)
 * [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.2_chef-provisionerless.box)
 * [opscode-ubuntu-12.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.10-i386_chef-provisionerless.box)
@@ -41,8 +45,12 @@ Boxes for obsolete operating systems will be placed here.
 * [opscode-debian-7.2.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.2.0_chef-provisionerless.box)
 * [opscode-debian-7.6-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6-i386_chef-provisionerless.box)
 * [opscode-debian-7.6](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.6_chef-provisionerless.box)
+* [opscode-debian-7.7-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.7-i386_chef-provisionerless.box)
+* [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.7_chef-provisionerless.box)
 * [opscode-fedora-18-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18-i386_chef-provisionerless.box)
 * [opscode-fedora-18](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-18_chef-provisionerless.box)
+* [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19-i386_chef-provisionerless.box)
+* [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19_chef-provisionerless.box)
 * [opscode-freebsd-9.2-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2-i386_chef-provisionerless.box)
 * [opscode-freebsd-9.2](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.2_chef-provisionerless.box)
 

diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 # Bento
 
-[![Build Status](http://img.shields.io/travis/opscode/bento.svg)][travis]
+[![Build Status](http://img.shields.io/travis/chef/bento.svg)][travis]
 
-[travis]: https://travis-ci.org/opscode/bento
+[travis]: https://travis-ci.org/chef/bento
 
 Bento is a project that encapsulates [Packer](http://packer.io) templates for building
 [Vagrant](http://vagrantup.com) baseboxes. We use these boxes internally at Chef Software, Inc. for
-testing Hosted Enterprise Chef, Private Enterprise Chef and our open source [cookbooks](https://supermarket.getchef.com/users/chef)
+testing Hosted Chef, Chef Server and our open source [cookbooks](https://supermarket.chef.io/users/chef)
 via [test-kitchen](http://kitchen.ci/).
 
 This project is managed by the CHEF Release Engineering team. For more information on the Release Engineering team's contribution, triage, and release process, please consult the [CHEF Release Engineering OSS Management Guide](https://docs.google.com/a/opscode.com/document/d/1oJB0vZb_3bl7_ZU2YMDBkMFdL-EWplW1BJv_FXTUOzg/edit).
@@ -29,12 +29,12 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16,
 * [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.0_chef-provisionerless.box)
 * [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10-i386_chef-provisionerless.box)
 * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box)
-* [opscode-debian-7.7-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.7-i386_chef-provisionerless.box)
-* [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.7_chef-provisionerless.box)
-* [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19-i386_chef-provisionerless.box)
-* [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-19_chef-provisionerless.box)
+* [opscode-debian-7.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8-i386_chef-provisionerless.box)
+* [opscode-debian-7.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8_chef-provisionerless.box)
 * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20-i386_chef-provisionerless.box)
 * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20_chef-provisionerless.box)
+* [opscode-fedora-21-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-21-i386_chef-provisionerless.box)
+* [opscode-fedora-21](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-21_chef-provisionerless.box)
 * [opscode-freebsd-9.3-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3-i386_chef-provisionerless.box)
 * [opscode-freebsd-9.3](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-9.3_chef-provisionerless.box)
 * [opscode-freebsd-10.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_freebsd-10.1_chef-provisionerless.box)
@@ -66,12 +66,12 @@ these boxes. Using `--provider vmware_fusion`, will not.
 * [opscode-centos-7.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-7.0_chef-provisionerless.box)
 * [opscode-debian-6.0.10-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10-i386_chef-provisionerless.box)
 * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10_chef-provisionerless.box)
-* [opscode-debian-7.7-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.7-i386_chef-provisionerless.box)
-* [opscode-debian-7.7](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.7_chef-provisionerless.box)
-* [opscode-fedora-19-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19-i386_chef-provisionerless.box)
-* [opscode-fedora-19](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-19_chef-provisionerless.box)
+* [opscode-debian-7.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8-i386_chef-provisionerless.box)
+* [opscode-debian-7.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8_chef-provisionerless.box)
 * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20-i386_chef-provisionerless.box)
 * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20_chef-provisionerless.box)
+* [opscode-fedora-21-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21-i386_chef-provisionerless.box)
+* [opscode-fedora-21](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21_chef-provisionerless.box)
 * [opscode-freebsd-9.3-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3-i386_chef-provisionerless.box)
 * [opscode-freebsd-9.3](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-9.3_chef-provisionerless.box)
 * [opscode-freebsd-10.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_freebsd-10.1_chef-provisionerless.box)
@@ -175,18 +175,18 @@ make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim!
 
 Mac OS X templates were adopted wholesale from [Fletcher Nichol's packer templates](https://github.com/fnichol/packer-templates).
 
-- Author: Seth Chisamore (<schisamo@getchef.com>)
-- Author: Stephen Delano (<stephen@getchef.com>)
-- Author: Joshua Timberman (<joshua@getchef.com>)
+- Author: Seth Chisamore (<schisamo@chef.io>)
+- Author: Stephen Delano (<stephen@chef.io>)
+- Author: Joshua Timberman (<joshua@chef.io>)
 - Author: Tim Dysinger (<tim@dysinger.net>)
 - Author: Chris McClimans (<chris@hippiehacker.org>)
-- Author: Julian Dunn (<jdunn@getchef.com>)
-- Author: Tom Duffield (<tom@getchef.com>)
+- Author: Julian Dunn (<jdunn@chef.io>)
+- Author: Tom Duffield (<tom@chef.io>)
 - Author: Ross Timson (<ross@rosstimson.com>)
 - Author: Fletcher Nichol (<fnichol@nichol.ca>)
 
 ```text
-Copyright 2012-2014, Chef Software, Inc. (<legal@getchef.com>)
+Copyright 2012-2014, Chef Software, Inc. (<legal@chef.io>)
 Copyright 2011-2012, Tim Dysinger (<tim@dysinger.net>)
 
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/packer/debian-7.7-amd64.json → packer/debian-7.8-amd64.json b/packer/debian-7.7-amd64.json → packer/debian-7.8-amd64.json
@@ -27,18 +27,18 @@
       "disk_size": 40960,
       "guest_os_type": "Debian_64",
       "http_directory": "http",
-      "iso_checksum": "df60b786ddd22710574ecb51d0a6e7f579cdd14a",
+      "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{user `mirror`}}/7.7.0/amd64/iso-cd/debian-7.7.0-amd64-CD-1.iso",
+      "iso_url": "{{user `mirror`}}/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-CD-1.iso",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
       "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
       "virtualbox_version_file": ".vbox_version",
-      "vm_name": "packer-debian-7.7-amd64",
-      "output_directory": "packer-debian-7.7-amd64-virtualbox",
+      "vm_name": "packer-debian-7.8-amd64",
+      "output_directory": "packer-debian-7.8-amd64-virtualbox",
       "vboxmanage": [
         [ "modifyvm", "{{.Name}}", "--memory", "384" ],
         [ "modifyvm", "{{.Name}}", "--cpus", "1" ]
@@ -65,19 +65,19 @@
       ],
       "boot_wait": "10s",
       "disk_size": 40960,
-      "guest_os_type": "debian5-64",
+      "guest_os_type": "debian7-64",
       "http_directory": "http",
-      "iso_checksum": "df60b786ddd22710574ecb51d0a6e7f579cdd14a",
+      "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{user `mirror`}}/7.7.0/amd64/iso-cd/debian-7.7.0-amd64-CD-1.iso",
+      "iso_url": "{{user `mirror`}}/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-CD-1.iso",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
       "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now",
       "tools_upload_flavor": "linux",
-      "vm_name": "packer-debian-7.7-amd64",
-      "output_directory": "packer-debian-7.7-amd64-vmware",
+      "vm_name": "packer-debian-7.8-amd64",
+      "output_directory": "packer-debian-7.8-amd64-vmware",
       "vmx_data": {
         "memsize": "384",
         "numvcpus": "1",
@@ -107,18 +107,18 @@
       "disk_size": 40960,
       "guest_os_type": "debian",
       "http_directory": "http",
-      "iso_checksum": "df60b786ddd22710574ecb51d0a6e7f579cdd14a",
+      "iso_checksum": "5f611b40b0803f8be1180da561cfbc159e381599",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{user `mirror`}}/7.7.0/amd64/iso-cd/debian-7.7.0-amd64-CD-1.iso",
+      "iso_url": "{{user `mirror`}}/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-CD-1.iso",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
       "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now",
       "parallels_tools_flavor": "lin",
       "prlctl_version_file": ".prlctl_version",
-      "vm_name": "debian-7.7-amd64",
-      "output_directory": "packer-debian-7.7-amd64-parallels",
+      "vm_name": "debian-7.8-amd64",
+      "output_directory": "packer-debian-7.8-amd64-parallels",
       "prlctl": [
         [ "set", "{{.Name}}", "--memsize", "384" ],
         [ "set", "{{.Name}}", "--cpus", "1" ]
@@ -128,7 +128,7 @@
   "post-processors": [
     {
       "type": "vagrant",
-      "output": "../builds/{{.Provider}}/parallels_debian-7.7_chef-{{user `chef_version`}}.box"
+      "output": "../builds/{{.Provider}}/parallels_debian-7.8_chef-{{user `chef_version`}}.box"
     }
   ],
   "provisioners": [

diff --git a/packer/debian-7.7-i386.json → packer/debian-7.8-i386.json b/packer/debian-7.7-i386.json → packer/debian-7.8-i386.json
@@ -27,18 +27,18 @@
       "disk_size": 40960,
       "guest_os_type": "Debian",
       "http_directory": "http",
-      "iso_checksum": "ca22b069189ab6b7a1f931ee64c7a2a81ac73c99",
+      "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{user `mirror`}}/7.7.0/i386/iso-cd/debian-7.7.0-i386-CD-1.iso",
+      "iso_url": "{{user `mirror`}}/7.8.0/i386/iso-cd/debian-7.8.0-i386-CD-1.iso",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
       "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
       "virtualbox_version_file": ".vbox_version",
-      "vm_name": "packer-debian-7.7-i386",
-      "output_directory": "packer-debian-7.7-i386-virtualbox",
+      "vm_name": "packer-debian-7.8-i386",
+      "output_directory": "packer-debian-7.8-i386-virtualbox",
       "vboxmanage": [
         [ "modifyvm", "{{.Name}}", "--memory", "384" ],
         [ "modifyvm", "{{.Name}}", "--cpus", "1" ]
@@ -65,19 +65,19 @@
       ],
       "boot_wait": "10s",
       "disk_size": 40960,
-      "guest_os_type": "debian5",
+      "guest_os_type": "debian7",
       "http_directory": "http",
-      "iso_checksum": "ca22b069189ab6b7a1f931ee64c7a2a81ac73c99",
+      "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{user `mirror`}}/7.7.0/i386/iso-cd/debian-7.7.0-i386-CD-1.iso",
+      "iso_url": "{{user `mirror`}}/7.8.0/i386/iso-cd/debian-7.8.0-i386-CD-1.iso",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
       "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now",
       "tools_upload_flavor": "linux",
-      "vm_name": "packer-debian-7.7-i386",
-      "output_directory": "packer-debian-7.7-i386-vmware",
+      "vm_name": "packer-debian-7.8-i386",
+      "output_directory": "packer-debian-7.8-i386-vmware",
       "vmx_data": {
         "memsize": "384",
         "numvcpus": "1",
@@ -107,29 +107,28 @@
       "disk_size": 40960,
       "guest_os_type": "debian",
       "http_directory": "http",
-      "iso_checksum": "ca22b069189ab6b7a1f931ee64c7a2a81ac73c99",
+      "iso_checksum": "d87664e590f39aba725ec9705dc58a8c75417fef",
       "iso_checksum_type": "sha1",
-      "iso_url": "{{user `mirror`}}/7.7.0/i386/iso-cd/debian-7.7.0-i386-CD-1.iso",
+      "iso_url": "{{user `mirror`}}/7.8.0/i386/iso-cd/debian-7.8.0-i386-CD-1.iso",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
       "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now",
       "parallels_tools_flavor": "lin",
       "prlctl_version_file": ".prlctl_version",
-      "vm_name": "debian-7.7-i386",
-      "output_directory": "packer-debian-7.7-i386-parallels",
+      "vm_name": "debian-7.8-i386",
+      "output_directory": "packer-debian-7.8-i386-parallels",
       "prlctl": [
         [ "set", "{{.Name}}", "--memsize", "384" ],
         [ "set", "{{.Name}}", "--cpus", "1" ]
       ]
     }
-
   ],
   "post-processors": [
     {
       "type": "vagrant",
-      "output": "../builds/{{.Provider}}/parallels_debian-7.7-i386_chef-{{user `chef_version`}}.box"
+      "output": "../builds/{{.Provider}}/parallels_debian-7.8-i386_chef-{{user `chef_version`}}.box"
     }
   ],
   "provisioners": [