Merge pull request #46 from juliandunn/BENTO-35

[BENTO-35] Do not ship Chef with our baseboxes anymore.

README.md

@@ -11,13 +11,29 @@ make "Don't Repeat Yourself" (DRY) modular baseboxes. Thanks Tim!
 ## Current Baseboxes
 
 The following baseboxes are publicly available and were built using
-this project, and Chef 11.4.4. Future releases of Chef and baseboxes
-will follow the naming convention used here:
+this project. Note that our baseboxes no longer include Chef Client.
+Vagrant can be instructed to install Chef at runtime using the
+[vagrant-omnibus](https://github.com/schisamo/vagrant-omnibus) plugin.
 
-    opscode_PLATFORM-VERSION_chef-VERSION.box
+64-bit boxes:
+
+* [opscode-centos-5.9](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9_provisionerless.box)
+* [opscode-centos-6.4](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box)
+* [opscode-ubuntu-10.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box)
+* [opscode-ubuntu-12.04](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box)
+
+32-bit boxes:
+
+* [opscode-centos-5.9-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9-i386_provisionerless.box)
+* [opscode-centos-6.4-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4-i386_provisionerless.box)
+* [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_provisionerless.box)
+* [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_provisionerless.box)
 
-and located in the opscode-vm S3 bucket's vagrant directory as linked
-below.
+## Older Baseboxes
+
+Older baseboxes include Chef.
+
+The following base boxes were built with Chef 11.4.4.
 
 64-bit boxes:
 
@@ -33,8 +49,6 @@ below.
 * [opscode-ubuntu-10.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04-i386_chef-11.4.4.box)
 * [opscode-ubuntu-12.04-i386](https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04-i386_chef-11.4.4.box)
 
-## Older Baseboxes
-
 The following base boxes were built with Chef 11.4.0.
 
 64-bit boxes:

definitions/.centos/session.rb

@@ -5,8 +5,7 @@
                          [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
                          :kickstart_file => "ks.cfg",
                          :os_type_id => 'Centos_64',
-                         :postinstall_files => [ "chef-client.sh",
-                                                 "vagrant.sh",
+                         :postinstall_files => [ "vagrant.sh",
                                                  "sshd.sh",
                                                  "cleanup.sh",
                                                  "minimize.sh" ],

definitions/.debian/session.rb

@@ -20,7 +20,6 @@
                          ],
                          :os_type_id => 'Debian_64',
                          :postinstall_files => [ "update.sh",
-                                                 "chef-client.sh",
                                                  "vagrant.sh",
                                                  "sshd.sh",
                                                  "networking.sh",

definitions/.ubuntu/session.rb

@@ -28,7 +28,6 @@
                          ],
                          :os_type_id => 'Ubuntu_64',
                          :postinstall_files => [ "update.sh",
-                                                 "chef-client.sh",
                                                  "vagrant.sh",
                                                  "sshd.sh",
                                                  "networking.sh",