From 7a7ae248a9f5ba4fd8a815738fb684bb4833c99b Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Wed, 4 Dec 2013 21:59:17 -0500 Subject: [PATCH 1/2] Convert RHEL templates to use a user-configurable mirror. Since the URLs in there are bogus, this is the only way a user can build these boxes after hosting the ISOs on his/her own server. --- packer/rhel-5.10-i386.json | 7 ++++--- packer/rhel-5.10-x86_64.json | 7 ++++--- packer/rhel-6.5-i386.json | 7 ++++--- packer/rhel-6.5-x86_64.json | 7 ++++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/packer/rhel-5.10-i386.json b/packer/rhel-5.10-i386.json index 4adbeea98..e488b0101 100644 --- a/packer/rhel-5.10-i386.json +++ b/packer/rhel-5.10-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/1ab756241a4a209b8d39abe6bace84a9" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "3a4db78ab70d866057c5285e0064d78125e1b8fd9dcaefea28818f6604b3515d", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/1ab756241a4a209b8d39abe6bace84a9/rhel-server-5.10-i386-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-5.10-i386-dvd.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -40,7 +41,7 @@ "http_directory": "http", "iso_checksum": "3a4db78ab70d866057c5285e0064d78125e1b8fd9dcaefea28818f6604b3515d", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/1ab756241a4a209b8d39abe6bace84a9/rhel-server-5.10-i386-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-5.10-i386-dvd.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer/rhel-5.10-x86_64.json b/packer/rhel-5.10-x86_64.json index d871a5663..21ddeaea0 100644 --- a/packer/rhel-5.10-x86_64.json +++ b/packer/rhel-5.10-x86_64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "8b38e74b0993d478aad9c950f51a3e3441199639a3422e06fc3beca1f8825bf2", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001/rhel-server-5.10-x86_64-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-5.10-x86_64-dvd.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -40,7 +41,7 @@ "http_directory": "http", "iso_checksum": "8b38e74b0993d478aad9c950f51a3e3441199639a3422e06fc3beca1f8825bf2", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-5.10/md5sum/86cc2d5548ee2ff9c8d3e2b4db3e6001/rhel-server-5.10-x86_64-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-5.10-x86_64-dvd.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer/rhel-6.5-i386.json b/packer/rhel-6.5-i386.json index 84cf373db..9bc53fd22 100644 --- a/packer/rhel-6.5-i386.json +++ b/packer/rhel-6.5-i386.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/04a1fa06a6b7e70cd586535eea83c0ef" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "eec692b436193ba9fc365cafe2b8f85323d98192dc99b23b02ae75045667fe4a", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/04a1fa06a6b7e70cd586535eea83c0ef/rhel-server-6.5-i386-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-6.5-i386-dvd.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -40,7 +41,7 @@ "http_directory": "http", "iso_checksum": "eec692b436193ba9fc365cafe2b8f85323d98192dc99b23b02ae75045667fe4a", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/04a1fa06a6b7e70cd586535eea83c0ef/rhel-server-6.5-i386-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-6.5-i386-dvd.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", diff --git a/packer/rhel-6.5-x86_64.json b/packer/rhel-6.5-x86_64.json index b06a5b76a..7e4f5fb1c 100644 --- a/packer/rhel-6.5-x86_64.json +++ b/packer/rhel-6.5-x86_64.json @@ -1,6 +1,7 @@ { "variables": { - "chef_version": "provisionerless" + "chef_version": "provisionerless", + "mirror": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/a84d4d9eddb36fb417832166cd10a4c2" }, "builders": [ { @@ -15,7 +16,7 @@ "http_directory": "http", "iso_checksum": "a51b90f3dd4585781293ea08adde60eeb9cfa94670943bd99e9c07f13a259539", "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/a84d4d9eddb36fb417832166cd10a4c2/rhel-server-6.5-x86_64-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-6.5-x86_64-dvd.iso", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", "ssh_port": 22, @@ -41,7 +42,7 @@ "iso_checksum": "a51b90f3dd4585781293ea08adde60eeb9cfa94670943bd99e9c07f13a259539" , "iso_checksum_type": "sha256", - "iso_url": "https://content-web.rhn.redhat.com/rhn/isos/rhel-6.5/md5sum/a84d4d9eddb36fb417832166cd10a4c2/rhel-server-6.5-x86_64-dvd.iso", + "iso_url": "{{user `mirror`}}/rhel-server-6.5-x86_64-dvd.iso", "tools_upload_flavor": "linux", "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p", "ssh_password": "vagrant", From 6f8003ef30cbd75552e322527c6668d840f51894 Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Wed, 4 Dec 2013 22:01:28 -0500 Subject: [PATCH 2/2] Added Travis badge, fix URL to test-kitchen --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c8ba96f0..04f211246 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,11 @@ # Bento +[![Build Status](https://travis-ci.org/opscode/bento.png)](https://travis-ci.org/opscode/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 Opscode for testing Hosted Enterprise Chef, Private Enterprise Chef and our open source [cookbooks](http://community.opscode.com/users/Opscode) -via [test-kitchen](http://github.com/opscode/test-kitchen). +via [test-kitchen](http://kitchen.ci/). ## Current Baseboxes