Skip to content

Commit

Permalink
Revert double-postinstall.sh, doesn't seem to work.
Browse files Browse the repository at this point in the history
rubygem-{bunny,systemu} are now in Fedora, so install directly.
  • Loading branch information
Julian C. Dunn committed Dec 19, 2012
1 parent 3e2a326 commit 40bf2a8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
12 changes: 6 additions & 6 deletions templates/Fedora-18-i386/definition.rb
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Veewee::Session.declare({
# Minimum RAM requirement for installation is 768MB.
:cpu_count => '1', :memory_size=> '768',
# Minimum RAM requirement for installation is 512MB.
:cpu_count => '1', :memory_size=> '512',
:disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :hwvirtext => 'on',
:os_type_id => 'Fedora',
:iso_file => "Fedora-18-Beta-TC9-i386-DVD.iso",
:iso_src => "http://dl.fedoraproject.org/pub/alt/stage/18-Beta-TC9/Fedora/i386/iso/Fedora-18-Beta-TC9-i386-DVD.iso",
:iso_md5 => "a673a3c4fa6fd731a7caeef75e3ca729",
:iso_file => "Fedora-18-Beta-i386-DVD.iso",
:iso_src => "http://download.fedoraproject.org/pub/fedora/linux/releases/test/18-Beta/Fedora/i386/iso/Fedora-18-Beta-i386-DVD.iso",
:iso_md5 => "fe79303aec5231df82ebe4a30e0dc83c",
:iso_download_timeout => 1000,
:boot_wait => "10", :boot_cmd_sequence => [ '<Tab> linux text biosdevname=0 ks=http://%IP%:%PORT%/ks.cfg<Enter><Enter>' ],
:kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
:ssh_login_timeout => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
:ssh_host_port => "7222", :ssh_guest_port => "22",
:sudo_cmd => "echo '%p'|sudo -S sh '%f'",
:shutdown_cmd => "/sbin/halt -h -p",
:postinstall_files => [ "postinstall.sh"], :postinstall_timeout => 10000
:postinstall_files => [ "postinstall.sh" ], :postinstall_timeout => 10000
})
4 changes: 3 additions & 1 deletion templates/Fedora-18-i386/postinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,22 @@ date > /etc/vagrant_box_build_time

VBOX_VERSION=$(cat /home/vagrant/.vbox_version)

yum -y update
yum -y update --exclude kernel*

yum -y install \
ruby \
ruby-devel \
puppet \
rubygems \
rubygem-bunny \
rubygem-erubis \
rubygem-highline \
rubygem-json \
rubygem-mime-types \
rubygem-net-ssh \
rubygem-polyglot \
rubygem-rest-client \
rubygem-systemu \
rubygem-treetop \
rubygem-uuidtools \
wget \
Expand Down

3 comments on commit 40bf2a8

@jedi4ever
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @juliandunn thanks for the update, I was wondering if the rubygem-{bunny,systemu} is specially necessary for puppet or chef?

If not, I suggest we leave them out as the point of the baseboxes is to go for a minimal install, later managed by a config mgmt tool.
But then again I'm not that familiar with puppet/chef installs on fedora.

@juliandunn
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @jedi4ever, those are needed for Chef. I'm slowly packaging Chef's gems for Fedora and EPEL, and one day we'll be able to do "yum install chef" rather than using "gem". This is progress along that route.

@jedi4ever
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gotcha. Ok merging now

Please sign in to comment.