Merge pull request #90 from tduffield/fix-box-names

Fix box names
chef · Oct 2, 2013 · 5404869 · 5404869
2 parents 27127fe + 8134df5
commit 5404869
Show file tree

Hide file tree

Showing 26 changed files with 35 additions and 45 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,4 @@ iso/
 virtualfloppy.vfd
 packer_cache/
 packer.log
-vmware/
-virtualbox/
-packer.log
 .DS_Store
diff --git a/builds/virtualbox/.gitignore b/builds/virtualbox/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/builds/vmware/.gitignore b/builds/vmware/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/packer/centos-5.9-i386.json b/packer/centos-5.9-i386.json
@@ -2,7 +2,7 @@
   "builders": [
     {
       "boot_command": [
-        "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>"
+        "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg<enter><wait>"
       ],
       "boot_wait": "10s",
       "disk_size": 40960,
@@ -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
@@ -2,7 +2,7 @@
   "builders": [
     {
       "boot_command": [
-        "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-6.4/ks.cfg<enter><wait>"
+        "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/centos-5.9/ks.cfg<enter><wait>"
       ],
       "boot_wait": "10s",
       "disk_size": 40960,
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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" ]
       ]
     },
     {
@@ -93,7 +83,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
     }
   ],