From ac643d697bfda1610084a6d5608a5238a1bac7b9 Mon Sep 17 00:00:00 2001 From: Tom Duffield Date: Tue, 1 Oct 2013 16:42:06 -0500 Subject: [PATCH 1/5] add empty builds directory with a subdirectory for each build type --- builds/virtualbox/.gitignore | 4 ++++ builds/vmware/.gitignore | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 builds/virtualbox/.gitignore create mode 100644 builds/vmware/.gitignore diff --git a/builds/virtualbox/.gitignore b/builds/virtualbox/.gitignore new file mode 100644 index 000000000..86d0cb272 --- /dev/null +++ b/builds/virtualbox/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore \ No newline at end of file diff --git a/builds/vmware/.gitignore b/builds/vmware/.gitignore new file mode 100644 index 000000000..86d0cb272 --- /dev/null +++ b/builds/vmware/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore \ No newline at end of file From 05fe17cdd3919e360974e61afe1e9f4f8d60c819 Mon Sep 17 00:00:00 2001 From: Tom Duffield Date: Tue, 1 Oct 2013 16:56:33 -0500 Subject: [PATCH 2/5] vagrant boxes now match current naming conventions and are built into the builds directory --- packer/centos-5.9-i386.json | 2 +- packer/centos-5.9-x86_64.json | 2 +- packer/centos-6.4-i386.json | 2 +- packer/centos-6.4-x86_64.json | 2 +- packer/debian-6.0.7-amd64.json | 2 +- packer/debian-6.0.7-i386.json | 2 +- packer/debian-7.1.0-amd64.json | 2 +- packer/debian-7.1.0-i386.json | 2 +- packer/fedora-18-i386.json | 2 +- packer/fedora-18-x86_64.json | 2 +- packer/fedora-19-i386.json | 2 +- packer/fedora-19-x86_64.json | 2 +- packer/fedora-20-i386.json | 2 +- packer/fedora-20-x86_64.json | 7 +------ packer/freebsd-9.1-amd64.json | 2 +- packer/ubuntu-10.04-amd64.json | 2 +- packer/ubuntu-10.04-i386.json | 2 +- packer/ubuntu-12.04-amd64.json | 2 +- packer/ubuntu-12.04-i386.json | 2 +- packer/ubuntu-12.10-amd64.json | 2 +- packer/ubuntu-12.10-i386.json | 2 +- packer/ubuntu-13.04-amd64.json | 2 +- packer/ubuntu-13.04-i386.json | 2 +- 23 files changed, 23 insertions(+), 28 deletions(-) diff --git a/packer/centos-5.9-i386.json b/packer/centos-5.9-i386.json index 618c9efd5..1d4e7aa2c 100644 --- a/packer/centos-5.9-i386.json +++ b/packer/centos-5.9-i386.json @@ -50,7 +50,7 @@ ], "post-processors": [ { - "output": "centos-5.9-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_centos-5.9-i386_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/centos-5.9-x86_64.json b/packer/centos-5.9-x86_64.json index 4c18ad766..d29245b0a 100644 --- a/packer/centos-5.9-x86_64.json +++ b/packer/centos-5.9-x86_64.json @@ -50,7 +50,7 @@ ], "post-processors": [ { - "output": "centos-5.9-x86_64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_centos-5.9_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/centos-6.4-i386.json b/packer/centos-6.4-i386.json index b14aa69ba..0df6ead14 100644 --- a/packer/centos-6.4-i386.json +++ b/packer/centos-6.4-i386.json @@ -50,7 +50,7 @@ ], "post-processors": [ { - "output": "centos-6.4-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_centos-6.4-i386_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/centos-6.4-x86_64.json b/packer/centos-6.4-x86_64.json index 6c8d887f3..9fc78042d 100644 --- a/packer/centos-6.4-x86_64.json +++ b/packer/centos-6.4-x86_64.json @@ -50,7 +50,7 @@ ], "post-processors": [ { - "output": "centos-6.4-x86_64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_centos-6.4_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/debian-6.0.7-amd64.json b/packer/debian-6.0.7-amd64.json index f03d89417..b4365fd16 100644 --- a/packer/debian-6.0.7-amd64.json +++ b/packer/debian-6.0.7-amd64.json @@ -79,7 +79,7 @@ "post-processors": [ { "type": "vagrant", - "output": "debian-6.0.7-amd64-{{.Provider}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-6.0.7_provisionerless.box" } ], "provisioners": [ diff --git a/packer/debian-6.0.7-i386.json b/packer/debian-6.0.7-i386.json index 6b2a82f7e..208180968 100644 --- a/packer/debian-6.0.7-i386.json +++ b/packer/debian-6.0.7-i386.json @@ -79,7 +79,7 @@ "post-processors": [ { "type": "vagrant", - "output": "debian-6.0.7-i386-{{.Provider}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-6.0.7-i386_provisionerless.box" } ], "provisioners": [ diff --git a/packer/debian-7.1.0-amd64.json b/packer/debian-7.1.0-amd64.json index eab546e0d..47b46cd8a 100644 --- a/packer/debian-7.1.0-amd64.json +++ b/packer/debian-7.1.0-amd64.json @@ -79,7 +79,7 @@ "post-processors": [ { "type": "vagrant", - "output": "debian-7.1.0-amd64-{{.Provider}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.1.0_provisionerless.box" } ], "provisioners": [ diff --git a/packer/debian-7.1.0-i386.json b/packer/debian-7.1.0-i386.json index 89937f0c7..917e2824f 100644 --- a/packer/debian-7.1.0-i386.json +++ b/packer/debian-7.1.0-i386.json @@ -79,7 +79,7 @@ "post-processors": [ { "type": "vagrant", - "output": "debian-7.1.0-i386-{{.Provider}}.box" + "output": "../builds/{{.Provider}}/opscode_debian-7.1.0-i386_provisionerless.box" } ], "provisioners": [ diff --git a/packer/fedora-18-i386.json b/packer/fedora-18-i386.json index 6148971a5..35871aef5 100644 --- a/packer/fedora-18-i386.json +++ b/packer/fedora-18-i386.json @@ -52,7 +52,7 @@ ], "post-processors": [ { - "output": "fedora-18-x86_64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_fedora-18_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/fedora-18-x86_64.json b/packer/fedora-18-x86_64.json index 14b9fe7a8..eafb7073d 100644 --- a/packer/fedora-18-x86_64.json +++ b/packer/fedora-18-x86_64.json @@ -52,7 +52,7 @@ ], "post-processors": [ { - "output": "fedora-18-x86_64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_fedora-18_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/fedora-19-i386.json b/packer/fedora-19-i386.json index 2024dd4dc..192c208e0 100644 --- a/packer/fedora-19-i386.json +++ b/packer/fedora-19-i386.json @@ -50,7 +50,7 @@ ], "post-processors": [ { - "output": "fedora-19-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_fedora-19-i386_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/fedora-19-x86_64.json b/packer/fedora-19-x86_64.json index 69dba152a..8326bdf42 100644 --- a/packer/fedora-19-x86_64.json +++ b/packer/fedora-19-x86_64.json @@ -50,7 +50,7 @@ ], "post-processors": [ { - "output": "fedora-19-x86_64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_fedora-19_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/fedora-20-i386.json b/packer/fedora-20-i386.json index f375a0d2f..a1b9a8394 100644 --- a/packer/fedora-20-i386.json +++ b/packer/fedora-20-i386.json @@ -50,7 +50,7 @@ ], "post-processors": [ { - "output": "fedora-19-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_fedora-19-i386_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/fedora-20-x86_64.json b/packer/fedora-20-x86_64.json index 500c42c0a..458e3603d 100644 --- a/packer/fedora-20-x86_64.json +++ b/packer/fedora-20-x86_64.json @@ -50,16 +50,11 @@ ], "post-processors": [ { - "output": "fedora-20-x86_64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_fedora-20-x86_64_provisionerless.box", "type": "vagrant" } ], "provisioners": [ - { - "type": "file", - "source": "scripts/fedora/shutdown.sh", - "destination": "/tmp/shutdown.sh" - }, { "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", "scripts": [ diff --git a/packer/freebsd-9.1-amd64.json b/packer/freebsd-9.1-amd64.json index ad4c5194b..b8268734a 100644 --- a/packer/freebsd-9.1-amd64.json +++ b/packer/freebsd-9.1-amd64.json @@ -92,7 +92,7 @@ ], "post-processors": [ { - "output": "freebsd-9.1-amd64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_freebsd-9.1_provisionerless.box", "type": "vagrant" } ] diff --git a/packer/ubuntu-10.04-amd64.json b/packer/ubuntu-10.04-amd64.json index 1b08ca2ca..6941d7211 100644 --- a/packer/ubuntu-10.04-amd64.json +++ b/packer/ubuntu-10.04-amd64.json @@ -94,7 +94,7 @@ ], "post-processors": [ { - "output": "ubuntu-10.04-amd64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-10.04_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-10.04-i386.json b/packer/ubuntu-10.04-i386.json index 774e7d03f..8856a91f5 100644 --- a/packer/ubuntu-10.04-i386.json +++ b/packer/ubuntu-10.04-i386.json @@ -94,7 +94,7 @@ ], "post-processors": [ { - "output": "ubuntu-10.04-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-10.04-i386_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json index 82f74989c..9642ff8c6 100644 --- a/packer/ubuntu-12.04-amd64.json +++ b/packer/ubuntu-12.04-amd64.json @@ -95,7 +95,7 @@ "post-processors": [ { "type": "vagrant", - "output": "ubuntu-12.04-amd64-{{.Provider}}.box" + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.04_provisionerless.box" } ], "provisioners": [ diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json index 0b8235fc0..b7702769d 100644 --- a/packer/ubuntu-12.04-i386.json +++ b/packer/ubuntu-12.04-i386.json @@ -94,7 +94,7 @@ ], "post-processors": [ { - "output": "ubuntu-12.04-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.04-i386_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json index 78f6bb4d6..8d0b59606 100644 --- a/packer/ubuntu-12.10-amd64.json +++ b/packer/ubuntu-12.10-amd64.json @@ -94,7 +94,7 @@ ], "post-processors": [ { - "output": "ubuntu-12.10-amd64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10-amd64_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json index 31da1e259..43deb3acc 100644 --- a/packer/ubuntu-12.10-i386.json +++ b/packer/ubuntu-12.10-i386.json @@ -94,7 +94,7 @@ ], "post-processors": [ { - "output": "ubuntu-12.10-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-12.10-i386_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json index 33adfa05f..e7e94fcaf 100644 --- a/packer/ubuntu-13.04-amd64.json +++ b/packer/ubuntu-13.04-amd64.json @@ -95,7 +95,7 @@ ], "post-processors": [ { - "output": "ubuntu-13.04-amd64-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-13.04_provisionerless.box", "type": "vagrant" } ], diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json index b990dad54..51363bf4b 100644 --- a/packer/ubuntu-13.04-i386.json +++ b/packer/ubuntu-13.04-i386.json @@ -94,7 +94,7 @@ ], "post-processors": [ { - "output": "ubuntu-13.04-i386-{{.Provider}}.box", + "output": "../builds/{{.Provider}}/opscode_ubuntu-13.04-i386_provisionerless.box", "type": "vagrant" } ], From 4bc2e4dcc41c1a832f252d10585583db8a591313 Mon Sep 17 00:00:00 2001 From: Tom Duffield Date: Tue, 1 Oct 2013 16:59:10 -0500 Subject: [PATCH 3/5] modified .gitignore --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index a5bd03a89..635044e1e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,4 @@ iso/ virtualfloppy.vfd packer_cache/ packer.log -vmware/ -virtualbox/ -packer.log .DS_Store From f239b591495677b215a2f63d9980944e33d63df7 Mon Sep 17 00:00:00 2001 From: Tom Duffield Date: Tue, 1 Oct 2013 21:46:42 -0500 Subject: [PATCH 4/5] pointing CentOS 5.9 to the correct HTTP directory --- packer/centos-5.9-i386.json | 2 +- packer/centos-5.9-x86_64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/centos-5.9-i386.json b/packer/centos-5.9-i386.json index 1d4e7aa2c..9aa7c817b 100644 --- a/packer/centos-5.9-i386.json +++ b/packer/centos-5.9-i386.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - " text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg" + " text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg" ], "boot_wait": "10s", "disk_size": 40960, diff --git a/packer/centos-5.9-x86_64.json b/packer/centos-5.9-x86_64.json index d29245b0a..c29c55ed8 100644 --- a/packer/centos-5.9-x86_64.json +++ b/packer/centos-5.9-x86_64.json @@ -2,7 +2,7 @@ "builders": [ { "boot_command": [ - " text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg" + " text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg" ], "boot_wait": "10s", "disk_size": 40960, From 8134df5abdb83b496b1256c456f7b1b27fd9cdf7 Mon Sep 17 00:00:00 2001 From: Tom Duffield Date: Wed, 2 Oct 2013 09:08:13 -0500 Subject: [PATCH 5/5] compressing vboxmanage for freebsd --- packer/freebsd-9.1-amd64.json | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/packer/freebsd-9.1-amd64.json b/packer/freebsd-9.1-amd64.json index 10cf47fff..2a6b148de 100644 --- a/packer/freebsd-9.1-amd64.json +++ b/packer/freebsd-9.1-amd64.json @@ -41,18 +41,8 @@ "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", "virtualbox_version_file": ".vbox_version", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + [ "modifyvm", "{{.Name}}", "--memory", "512" ], + [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] }, {