From ffb30b9f075774fe76d53202044f7d311a232860 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Mon, 6 May 2013 21:57:46 -0500 Subject: [PATCH 1/2] Remove chef client for provisionerless base boxes support --- definitions/.centos/session.rb | 3 +-- definitions/.ubuntu/session.rb | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/definitions/.centos/session.rb b/definitions/.centos/session.rb index 9c49280aa..d1d1164fe 100644 --- a/definitions/.centos/session.rb +++ b/definitions/.centos/session.rb @@ -5,8 +5,7 @@ [ 'linux text ks=http://%IP%:%PORT%/ks.cfg' ], :kickstart_file => "ks.cfg", :os_type_id => 'Centos_64', - :postinstall_files => [ "chef-client.sh", - "vagrant.sh", + :postinstall_files => [ "vagrant.sh", "cleanup.sh", "minimize.sh" ], :shutdown_cmd => "/sbin/halt -h -p" }) diff --git a/definitions/.ubuntu/session.rb b/definitions/.ubuntu/session.rb index ab020b257..36ea00ed0 100644 --- a/definitions/.ubuntu/session.rb +++ b/definitions/.ubuntu/session.rb @@ -28,7 +28,6 @@ ], :os_type_id => 'Ubuntu_64', :postinstall_files => [ "update.sh", - "chef-client.sh", "vagrant.sh", "networking.sh", "sudoers.sh", From 89c9959f72e39b83879d03139d5033ceb6c4713f Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Sun, 12 May 2013 22:19:01 -0400 Subject: [PATCH 2/2] [BENTO-35] Remove chef-client.sh and symlinks from all definitions. Update README to reflect the fact that we no longer ship Chef with baseboxes. --- README.md | 28 +++++++++++++++----- definitions/.common/chef-client.sh | 3 --- definitions/.debian/session.rb | 1 - definitions/centos-5.5-i386/chef-client.sh | 1 - definitions/centos-5.5/chef-client.sh | 1 - definitions/centos-5.6/chef-client.sh | 1 - definitions/centos-5.7/chef-client.sh | 1 - definitions/centos-5.8-i386/chef-client.sh | 1 - definitions/centos-5.8/chef-client.sh | 1 - definitions/centos-6.0/chef-client.sh | 1 - definitions/centos-6.2-i386/chef-client.sh | 1 - definitions/centos-6.2/chef-client.sh | 1 - definitions/centos-6.3-i386/chef-client.sh | 1 - definitions/centos-6.3/chef-client.sh | 1 - definitions/debian-6.0.5-i386/chef-client.sh | 1 - definitions/debian-6.0.5/chef-client.sh | 1 - definitions/ubuntu-10.04-i386/chef-client.sh | 1 - definitions/ubuntu-10.04/chef-client.sh | 1 - definitions/ubuntu-10.10/chef-client.sh | 1 - definitions/ubuntu-11.04/chef-client.sh | 1 - definitions/ubuntu-11.10/chef-client.sh | 1 - definitions/ubuntu-12.04-i386/chef-client.sh | 1 - definitions/ubuntu-12.04/chef-client.sh | 1 - definitions/ubuntu-12.10-i386/chef-client.sh | 1 - definitions/ubuntu-12.10/chef-client.sh | 1 - 25 files changed, 21 insertions(+), 33 deletions(-) delete mode 100644 definitions/.common/chef-client.sh delete mode 120000 definitions/centos-5.5-i386/chef-client.sh delete mode 120000 definitions/centos-5.5/chef-client.sh delete mode 120000 definitions/centos-5.6/chef-client.sh delete mode 120000 definitions/centos-5.7/chef-client.sh delete mode 120000 definitions/centos-5.8-i386/chef-client.sh delete mode 120000 definitions/centos-5.8/chef-client.sh delete mode 120000 definitions/centos-6.0/chef-client.sh delete mode 120000 definitions/centos-6.2-i386/chef-client.sh delete mode 120000 definitions/centos-6.2/chef-client.sh delete mode 120000 definitions/centos-6.3-i386/chef-client.sh delete mode 120000 definitions/centos-6.3/chef-client.sh delete mode 120000 definitions/debian-6.0.5-i386/chef-client.sh delete mode 120000 definitions/debian-6.0.5/chef-client.sh delete mode 120000 definitions/ubuntu-10.04-i386/chef-client.sh delete mode 120000 definitions/ubuntu-10.04/chef-client.sh delete mode 120000 definitions/ubuntu-10.10/chef-client.sh delete mode 120000 definitions/ubuntu-11.04/chef-client.sh delete mode 120000 definitions/ubuntu-11.10/chef-client.sh delete mode 120000 definitions/ubuntu-12.04-i386/chef-client.sh delete mode 120000 definitions/ubuntu-12.04/chef-client.sh delete mode 120000 definitions/ubuntu-12.10-i386/chef-client.sh delete mode 120000 definitions/ubuntu-12.10/chef-client.sh diff --git a/README.md b/README.md index 2f399d336..5f1bdc11d 100644 --- a/README.md +++ b/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: diff --git a/definitions/.common/chef-client.sh b/definitions/.common/chef-client.sh deleted file mode 100644 index f1f28d4d2..000000000 --- a/definitions/.common/chef-client.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -wget -O - http://opscode.com/chef/install.sh | sudo bash diff --git a/definitions/.debian/session.rb b/definitions/.debian/session.rb index 81c436a61..80306953e 100644 --- a/definitions/.debian/session.rb +++ b/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", diff --git a/definitions/centos-5.5-i386/chef-client.sh b/definitions/centos-5.5-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-5.5-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-5.5/chef-client.sh b/definitions/centos-5.5/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-5.5/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-5.6/chef-client.sh b/definitions/centos-5.6/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-5.6/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-5.7/chef-client.sh b/definitions/centos-5.7/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-5.7/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-5.8-i386/chef-client.sh b/definitions/centos-5.8-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-5.8-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-5.8/chef-client.sh b/definitions/centos-5.8/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-5.8/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-6.0/chef-client.sh b/definitions/centos-6.0/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-6.0/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-6.2-i386/chef-client.sh b/definitions/centos-6.2-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-6.2-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-6.2/chef-client.sh b/definitions/centos-6.2/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-6.2/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-6.3-i386/chef-client.sh b/definitions/centos-6.3-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-6.3-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/centos-6.3/chef-client.sh b/definitions/centos-6.3/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/centos-6.3/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/debian-6.0.5-i386/chef-client.sh b/definitions/debian-6.0.5-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/debian-6.0.5-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/debian-6.0.5/chef-client.sh b/definitions/debian-6.0.5/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/debian-6.0.5/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04-i386/chef-client.sh b/definitions/ubuntu-10.04-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-10.04-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.04/chef-client.sh b/definitions/ubuntu-10.04/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-10.04/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-10.10/chef-client.sh b/definitions/ubuntu-10.10/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-10.10/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.04/chef-client.sh b/definitions/ubuntu-11.04/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-11.04/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-11.10/chef-client.sh b/definitions/ubuntu-11.10/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-11.10/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04-i386/chef-client.sh b/definitions/ubuntu-12.04-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-12.04-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.04/chef-client.sh b/definitions/ubuntu-12.04/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-12.04/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10-i386/chef-client.sh b/definitions/ubuntu-12.10-i386/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-12.10-i386/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file diff --git a/definitions/ubuntu-12.10/chef-client.sh b/definitions/ubuntu-12.10/chef-client.sh deleted file mode 120000 index 635081810..000000000 --- a/definitions/ubuntu-12.10/chef-client.sh +++ /dev/null @@ -1 +0,0 @@ -../.common/chef-client.sh \ No newline at end of file