From 0d6547c27369aabcfbe307de140cba5027492043 Mon Sep 17 00:00:00 2001 From: Tim Kuhlman Date: Tue, 22 Apr 2014 10:54:56 -0600 Subject: [PATCH] Converted to packer rather than veewee --- .gitignore | 2 + README.md | 21 +++--- templates/Veeweefile | 8 --- templates/hlinux-amd64-netboot/definition.rb | 50 ------------- templates/hlinux.json | 72 +++++++++++++++++++ .../preseed.cfg | 0 .../{hlinux-amd64-netboot => scripts}/base.sh | 0 .../{hlinux-amd64-netboot => scripts}/chef.sh | 0 .../cleanup.sh | 0 .../{hlinux-amd64-netboot => scripts}/ruby.sh | 0 .../vagrant.sh | 0 .../virtualbox.sh | 0 .../zerodisk.sh | 0 13 files changed, 84 insertions(+), 69 deletions(-) delete mode 100644 templates/Veeweefile delete mode 100644 templates/hlinux-amd64-netboot/definition.rb create mode 100644 templates/hlinux.json rename templates/{hlinux-amd64-netboot => http}/preseed.cfg (100%) rename templates/{hlinux-amd64-netboot => scripts}/base.sh (100%) rename templates/{hlinux-amd64-netboot => scripts}/chef.sh (100%) rename templates/{hlinux-amd64-netboot => scripts}/cleanup.sh (100%) rename templates/{hlinux-amd64-netboot => scripts}/ruby.sh (100%) rename templates/{hlinux-amd64-netboot => scripts}/vagrant.sh (100%) rename templates/{hlinux-amd64-netboot => scripts}/virtualbox.sh (100%) rename templates/{hlinux-amd64-netboot => scripts}/zerodisk.sh (100%) diff --git a/.gitignore b/.gitignore index 163ca9c..63dafb3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ .vagrant Berksfile.lock .project +templates/output-virtualbox-iso +templates/packer_cache diff --git a/README.md b/README.md index 72c0803..a2b174c 100644 --- a/README.md +++ b/README.md @@ -83,16 +83,15 @@ this point hLinux has not been turned on by default: - Slow network performance of the hLinux vbox image makes some tasks annoying. # Creating a new hLinux box -The [hLinux](http://hlinux-home.usa.hp.com/wiki/index.php/Main_Page) box used in mini-mon is created via a [veewee](https://github.com/jedi4ever/veewee) -template in the templates directory. +The [hLinux](http://hlinux-home.usa.hp.com/wiki/index.php/Main_Page) box used in mini-mon is created via [packer](http://www.packer.io/), config is in +the templates directory. -- Follow the instructions at the [veewee](https://github.com/jedi4ever/veewee) site to install veewee. - - Copy `templates/Veeweefile` to your VeeWee directory and edit the file, updating the path to your mini-mon. - - At this point the template assumes you need an hp proxy setup, if not edit base.sh and comment out the .curlrc lines at the bottom - - From your veewee directory run: - - `bundle exec veewee vbox define hlinux hlinux-amd64-netboot` - - `bundle exec veewee vbox build hlinux` - - `bundle exec veewee vbox validate hlinux` Note: puppet is not installed. - - `bundle exec veewee vbox export hlinux` -- From the mini-mon directory run `vagrant box add hlinux ../veewee/hlinux.box` or other appropriate path, also upload to a server for others to download. +- Install packer + - `brew tap homebrew/binary` + - `brew install packer` +- Run packer + - `cd templates` + - `packer build hlinux.json` +- From the mini-mon directory run `vagrant box add hlinux templates/packer_virtualbox-iso_virtualbox.box` - If you have an existing hLinux box you man need to first remove it `vagrant box remove hlinux` + - Also upload to a server for others to download. diff --git a/templates/Veeweefile b/templates/Veeweefile deleted file mode 100644 index 1796077..0000000 --- a/templates/Veeweefile +++ /dev/null @@ -1,8 +0,0 @@ -Veewee::Config.run do |config| - - env = config.veewee.env - - # These env settings will override default settings - env.template_path = ['/Users/kuhlmant/src/mon/mini-mon/templates'] - -end diff --git a/templates/hlinux-amd64-netboot/definition.rb b/templates/hlinux-amd64-netboot/definition.rb deleted file mode 100644 index dc30ddd..0000000 --- a/templates/hlinux-amd64-netboot/definition.rb +++ /dev/null @@ -1,50 +0,0 @@ -# Copied from the veewee provided template, Debian-7.4.0-amd64-netboot, with modifications added - -Veewee::Definition.declare({ - :cpu_count => '1', - :memory_size=> '256', - :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', - :os_type_id => 'Debian_64', - :iso_file => "netinstall-hLinux.iso", - :iso_src => "http://hlinux-hrepo.usa.hp.com/hLinuxISO/netinstall-hLinux.iso", - :iso_md5 => "e7e9433973f082a297793c3c5010b2c5", - :iso_download_timeout => "1000", - :boot_wait => "10", :boot_cmd_sequence => [ - '', - 'install ', - 'preseed/url=http://%IP%:%PORT%/preseed.cfg ', - 'debian-installer=en_US ', - 'auto ', - 'locale=en_US ', - 'kbd-chooser/method=us ', - 'netcfg/get_hostname=%NAME% ', - 'netcfg/get_domain=vagrantup.com ', - 'fb=false ', - 'debconf/frontend=noninteractive ', - 'console-setup/ask_detect=false ', - 'console-keymaps-at/keymap=us ', - 'keyboard-configuration/xkb-keymap=us ', - '' - ], - :kickstart_port => "7122", - :kickstart_timeout => "10000", - :kickstart_file => "preseed.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 bash -c 'source /root/.bashrc && bash %f'", - :shutdown_cmd => "halt -p", - :postinstall_files => [ - "base.sh", - "vagrant.sh", - "virtualbox.sh", - "ruby.sh", - "chef.sh", - "cleanup.sh", - "zerodisk.sh" - ], - :postinstall_timeout => "10000" -}) diff --git a/templates/hlinux.json b/templates/hlinux.json new file mode 100644 index 0000000..4a5173c --- /dev/null +++ b/templates/hlinux.json @@ -0,0 +1,72 @@ +{ + "provisioners": [ + { + "type": "shell", + "scripts": [ + "scripts/base.sh", + "scripts/vagrant.sh", + "scripts/virtualbox.sh", + "scripts/ruby.sh", + "scripts/chef.sh", + "scripts/cleanup.sh", + "scripts/zerodisk.sh" + ], + "override": { + "virtualbox-iso": { + "execute_command": "echo 'vagrant'|sudo -S bash -c 'source /root/.bashrc && bash {{.Path}}'" + } + } + } + ], + "builders": [ + { + "type": "virtualbox-iso", + "boot_command": [ + "", + "install ", + "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg ", + "debian-installer=en_US ", + "auto ", + "locale=en_US ", + "kbd-chooser/method=us ", + "netcfg/get_hostname={{ .Name }} ", + "netcfg/get_domain=vagrantup.com ", + "fb=false ", + "debconf/frontend=noninteractive ", + "console-setup/ask_detect=false ", + "console-keymaps-at/keymap=us ", + "keyboard-configuration/xkb-keymap=us ", + "" + ], + "boot_wait": "10s", + "disk_size": 10140, + "guest_os_type": "Debian_64", + "http_directory": "http", + "iso_checksum": "72922d5b488a7d5c7ce782d55f2bd162", + "iso_checksum_type": "md5", + "iso_url": "http://hlinux-hrepo.usa.hp.com/hLinuxISO/netinstall-hLinux.iso", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_wait_timeout": "10000s", + "shutdown_command": "echo 'halt -p' > shutdown.sh; echo 'vagrant'|sudo -S bash -c 'source /root/.bashrc && bash shutdown.sh'", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "virtualbox_version_file": ".vbox_version", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "256" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "1" + ] + ] + } + ], + "post-processors": ["vagrant"] +} diff --git a/templates/hlinux-amd64-netboot/preseed.cfg b/templates/http/preseed.cfg similarity index 100% rename from templates/hlinux-amd64-netboot/preseed.cfg rename to templates/http/preseed.cfg diff --git a/templates/hlinux-amd64-netboot/base.sh b/templates/scripts/base.sh similarity index 100% rename from templates/hlinux-amd64-netboot/base.sh rename to templates/scripts/base.sh diff --git a/templates/hlinux-amd64-netboot/chef.sh b/templates/scripts/chef.sh similarity index 100% rename from templates/hlinux-amd64-netboot/chef.sh rename to templates/scripts/chef.sh diff --git a/templates/hlinux-amd64-netboot/cleanup.sh b/templates/scripts/cleanup.sh similarity index 100% rename from templates/hlinux-amd64-netboot/cleanup.sh rename to templates/scripts/cleanup.sh diff --git a/templates/hlinux-amd64-netboot/ruby.sh b/templates/scripts/ruby.sh similarity index 100% rename from templates/hlinux-amd64-netboot/ruby.sh rename to templates/scripts/ruby.sh diff --git a/templates/hlinux-amd64-netboot/vagrant.sh b/templates/scripts/vagrant.sh similarity index 100% rename from templates/hlinux-amd64-netboot/vagrant.sh rename to templates/scripts/vagrant.sh diff --git a/templates/hlinux-amd64-netboot/virtualbox.sh b/templates/scripts/virtualbox.sh similarity index 100% rename from templates/hlinux-amd64-netboot/virtualbox.sh rename to templates/scripts/virtualbox.sh diff --git a/templates/hlinux-amd64-netboot/zerodisk.sh b/templates/scripts/zerodisk.sh similarity index 100% rename from templates/hlinux-amd64-netboot/zerodisk.sh rename to templates/scripts/zerodisk.sh