Merge pull request #362 from chef/remove-chef-version

Remove `chef_version` user variable & remove Chef installation option.
chef · May 26, 2015 · 61290b3 · 61290b3
2 parents 7b0d85d + 1f60142
commit 61290b3
Show file tree

Hide file tree

Showing 48 changed files with 89 additions and 461 deletions.
diff --git a/centos-5.11-i386.json b/centos-5.11-i386.json
@@ -102,29 +102,25 @@
   ],
   "post-processors": [
     {
-      "output": "builds/{{.Provider}}/opscode_centos-5.11-i386_chef-{{user `chef_version`}}.box",
+      "output": "builds/{{.Provider}}/opscode_centos-5.11-i386.box",
       "type": "vagrant"
     }
   ],
   "provisioners": [
     {
-      "environment_vars": [
-        "CHEF_VERSION={{user `chef_version`}}"
-      ],
+      "environment_vars": [],
       "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'",
       "scripts": [
         "scripts/common/vagrant.sh",
         "scripts/common/sshd.sh",
         "scripts/common/vmtools.sh",
-        "scripts/common/chef.sh",
         "scripts/centos/cleanup.sh",
         "scripts/common/minimize.sh"
       ],
       "type": "shell"
     }
   ],
   "variables": {
-    "chef_version": "provisionerless",
     "mirror": "http://mirrors.kernel.org/centos"
   }
 }

diff --git a/centos-5.11-x86_64.json b/centos-5.11-x86_64.json
@@ -102,29 +102,25 @@
   ],
   "post-processors": [
     {
-      "output": "builds/{{.Provider}}/opscode_centos-5.11_chef-{{user `chef_version`}}.box",
+      "output": "builds/{{.Provider}}/opscode_centos-5.11.box",
       "type": "vagrant"
     }
   ],
   "provisioners": [
     {
-      "environment_vars": [
-        "CHEF_VERSION={{user `chef_version`}}"
-      ],
+      "environment_vars": [],
       "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'",
       "scripts": [
         "scripts/common/vagrant.sh",
         "scripts/common/sshd.sh",
         "scripts/common/vmtools.sh",
-        "scripts/common/chef.sh",
         "scripts/centos/cleanup.sh",
         "scripts/common/minimize.sh"
       ],
       "type": "shell"
     }
   ],
   "variables": {
-    "chef_version": "provisionerless",
     "mirror": "http://mirrors.kernel.org/centos"
   }
 }

diff --git a/centos-6.6-i386.json b/centos-6.6-i386.json
@@ -102,30 +102,26 @@
   ],
   "post-processors": [
     {
-      "output": "builds/{{.Provider}}/opscode_centos-6.6-i386_chef-{{user `chef_version`}}.box",
+      "output": "builds/{{.Provider}}/opscode_centos-6.6-i386.box",
       "type": "vagrant"
     }
   ],
   "provisioners": [
     {
-      "environment_vars": [
-        "CHEF_VERSION={{user `chef_version`}}"
-      ],
+      "environment_vars": [],
       "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'",
       "scripts": [
         "scripts/centos/fix-slow-dns.sh",
         "scripts/common/sshd.sh",
         "scripts/common/vagrant.sh",
         "scripts/common/vmtools.sh",
-        "scripts/common/chef.sh",
         "scripts/centos/cleanup.sh",
         "scripts/common/minimize.sh"
       ],
       "type": "shell"
     }
   ],
   "variables": {
-    "chef_version": "provisionerless",
     "mirror": "http://mirrors.kernel.org/centos"
   }
 }

diff --git a/centos-6.6-x86_64.json b/centos-6.6-x86_64.json
@@ -102,30 +102,26 @@
   ],
   "post-processors": [
     {
-      "output": "builds/{{.Provider}}/opscode_centos-6.6_chef-{{user `chef_version`}}.box",
+      "output": "builds/{{.Provider}}/opscode_centos-6.6.box",
       "type": "vagrant"
     }
   ],
   "provisioners": [
     {
-      "environment_vars": [
-        "CHEF_VERSION={{user `chef_version`}}"
-      ],
+      "environment_vars": [],
       "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'",
       "scripts": [
         "scripts/centos/fix-slow-dns.sh",
         "scripts/common/sshd.sh",
         "scripts/common/vagrant.sh",
         "scripts/common/vmtools.sh",
-        "scripts/common/chef.sh",
         "scripts/centos/cleanup.sh",
         "scripts/common/minimize.sh"
       ],
       "type": "shell"
     }
   ],
   "variables": {
-    "chef_version": "provisionerless",
     "mirror": "http://mirrors.kernel.org/centos"
   }
 }

diff --git a/centos-7.1-x86_64.json b/centos-7.1-x86_64.json
@@ -102,30 +102,26 @@
   ],
   "post-processors": [
     {
-      "output": "builds/{{.Provider}}/opscode_centos-7.1_chef-{{user `chef_version`}}.box",
+      "output": "builds/{{.Provider}}/opscode_centos-7.1.box",
       "type": "vagrant"
     }
   ],
   "provisioners": [
     {
-      "environment_vars": [
-        "CHEF_VERSION={{user `chef_version`}}"
-      ],
+      "environment_vars": [],
       "execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E bash '{{.Path}}'",
       "scripts": [
         "scripts/centos/fix-slow-dns.sh",
         "scripts/common/sshd.sh",
         "scripts/common/vagrant.sh",
         "scripts/common/vmtools.sh",
-        "scripts/common/chef.sh",
         "scripts/centos/cleanup.sh",
         "scripts/common/minimize.sh"
       ],
       "type": "shell"
     }
   ],
   "variables": {
-    "chef_version": "provisionerless",
     "mirror": "http://mirrors.kernel.org/centos"
   }
 }

diff --git a/debian-6.0.10-amd64.json b/debian-6.0.10-amd64.json
@@ -144,15 +144,13 @@
   ],
   "post-processors": [
     {
-      "output": "builds/{{.Provider}}/opscode_debian-6.0.10_chef-{{user `chef_version`}}.box",
+      "output": "builds/{{.Provider}}/opscode_debian-6.0.10.box",
       "type": "vagrant"
     }
   ],
   "provisioners": [
     {
-      "environment_vars": [
-        "CHEF_VERSION={{user `chef_version`}}"
-      ],
+      "environment_vars": [],
       "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
       "scripts": [
         "scripts/debian/update.sh",
@@ -161,15 +159,13 @@
         "scripts/debian/sudoers.sh",
         "scripts/common/vagrant.sh",
         "scripts/common/vmtools.sh",
-        "scripts/common/chef.sh",
         "scripts/debian/cleanup.sh",
         "scripts/common/minimize.sh"
       ],
       "type": "shell"
     }
   ],
   "variables": {
-    "chef_version": "provisionerless",
     "mirror": "http://cdimage.debian.org/cdimage/archive"
   }
 }

diff --git a/debian-6.0.10-i386.json b/debian-6.0.10-i386.json
@@ -144,15 +144,13 @@
   ],
   "post-processors": [
     {
-      "output": "builds/{{.Provider}}/opscode_debian-6.0.10-i386_chef-{{user `chef_version`}}.box",
+      "output": "builds/{{.Provider}}/opscode_debian-6.0.10-i386.box",
       "type": "vagrant"
     }
   ],
   "provisioners": [
     {
-      "environment_vars": [
-        "CHEF_VERSION={{user `chef_version`}}"
-      ],
+      "environment_vars": [],
       "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
       "scripts": [
         "scripts/debian/update.sh",
@@ -161,15 +159,13 @@
         "scripts/debian/sudoers.sh",
         "scripts/common/vagrant.sh",
         "scripts/common/vmtools.sh",
-        "scripts/common/chef.sh",
         "scripts/debian/cleanup.sh",
         "scripts/common/minimize.sh"
       ],
       "type": "shell"
     }
   ],
   "variables": {
-    "chef_version": "provisionerless",
     "mirror": "http://cdimage.debian.org/cdimage/archive"
   }
 }

diff --git a/debian-7.8-amd64.json b/debian-7.8-amd64.json
@@ -144,15 +144,13 @@
   ],
   "post-processors": [
     {
-      "output": "builds/{{.Provider}}/opscode_debian-7.8_chef-{{user `chef_version`}}.box",
+      "output": "builds/{{.Provider}}/opscode_debian-7.8.box",
       "type": "vagrant"
     }
   ],
   "provisioners": [
     {
-      "environment_vars": [
-        "CHEF_VERSION={{user `chef_version`}}"
-      ],
+      "environment_vars": [],
       "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
       "scripts": [
         "scripts/debian/update.sh",
@@ -161,15 +159,13 @@
         "scripts/debian/sudoers.sh",
         "scripts/common/vagrant.sh",
         "scripts/common/vmtools.sh",
-        "scripts/common/chef.sh",
         "scripts/debian/cleanup.sh",
         "scripts/common/minimize.sh"
       ],
       "type": "shell"
     }
   ],
   "variables": {
-    "chef_version": "provisionerless",
     "mirror": "http://cdimage.debian.org/cdimage/archive"
   }
 }

diff --git a/debian-7.8-i386.json b/debian-7.8-i386.json
@@ -144,15 +144,13 @@
   ],
   "post-processors": [
     {
-      "output": "builds/{{.Provider}}/opscode_debian-7.8-i386_chef-{{user `chef_version`}}.box",
+      "output": "builds/{{.Provider}}/opscode_debian-7.8-i386.box",
       "type": "vagrant"
     }
   ],
   "provisioners": [
     {
-      "environment_vars": [
-        "CHEF_VERSION={{user `chef_version`}}"
-      ],
+      "environment_vars": [],
       "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
       "scripts": [
         "scripts/debian/update.sh",
@@ -161,15 +159,13 @@
         "scripts/debian/sudoers.sh",
         "scripts/common/vagrant.sh",
         "scripts/common/vmtools.sh",
-        "scripts/common/chef.sh",
         "scripts/debian/cleanup.sh",
         "scripts/common/minimize.sh"
       ],
       "type": "shell"
     }
   ],
   "variables": {
-    "chef_version": "provisionerless",
     "mirror": "http://cdimage.debian.org/cdimage/archive"
   }
 }

diff --git a/fedora-20-i386.json b/fedora-20-i386.json
@@ -102,21 +102,18 @@
   ],
   "post-processors": [
     {
-      "output": "builds/{{.Provider}}/opscode_fedora-20-i386_chef-{{user `chef_version`}}.box",
+      "output": "builds/{{.Provider}}/opscode_fedora-20-i386.box",
       "type": "vagrant"
     }
   ],
   "provisioners": [
     {
-      "environment_vars": [
-        "CHEF_VERSION={{user `chef_version`}}"
-      ],
+      "environment_vars": [],
       "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
       "scripts": [
         "scripts/fedora/fix-slow-dns.sh",
         "scripts/common/sshd.sh",
         "scripts/common/vmtools.sh",
-        "scripts/common/chef.sh",
         "scripts/common/vagrant.sh",
         "scripts/fedora/cleanup.sh",
         "scripts/common/minimize.sh"
@@ -125,7 +122,6 @@
     }
   ],
   "variables": {
-    "chef_version": "provisionerless",
     "mirror": "http://download.fedoraproject.org/pub/fedora/linux"
   }
 }

diff --git a/fedora-20-x86_64.json b/fedora-20-x86_64.json
@@ -102,21 +102,18 @@
   ],
   "post-processors": [
     {
-      "output": "builds/{{.Provider}}/opscode_fedora-20_chef-{{user `chef_version`}}.box",
+      "output": "builds/{{.Provider}}/opscode_fedora-20.box",
       "type": "vagrant"
     }
   ],
   "provisioners": [
     {
-      "environment_vars": [
-        "CHEF_VERSION={{user `chef_version`}}"
-      ],
+      "environment_vars": [],
       "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
       "scripts": [
         "scripts/fedora/fix-slow-dns.sh",
         "scripts/common/sshd.sh",
         "scripts/common/vmtools.sh",
-        "scripts/common/chef.sh",
         "scripts/common/vagrant.sh",
         "scripts/fedora/cleanup.sh",
         "scripts/common/minimize.sh"
@@ -125,7 +122,6 @@
     }
   ],
   "variables": {
-    "chef_version": "provisionerless",
     "mirror": "http://download.fedoraproject.org/pub/fedora/linux"
   }
 }

diff --git a/fedora-21-i386.json b/fedora-21-i386.json
@@ -102,21 +102,18 @@
   ],
   "post-processors": [
     {
-      "output": "builds/{{.Provider}}/opscode_fedora-21-i386_chef-{{user `chef_version`}}.box",
+      "output": "builds/{{.Provider}}/opscode_fedora-21-i386.box",
       "type": "vagrant"
     }
   ],
   "provisioners": [
     {
-      "environment_vars": [
-        "CHEF_VERSION={{user `chef_version`}}"
-      ],
+      "environment_vars": [],
       "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
       "scripts": [
         "scripts/fedora/fix-slow-dns.sh",
         "scripts/common/sshd.sh",
         "scripts/common/vmtools.sh",
-        "scripts/common/chef.sh",
         "scripts/common/vagrant.sh",
         "scripts/fedora/cleanup.sh",
         "scripts/common/minimize.sh"
@@ -125,7 +122,6 @@
     }
   ],
   "variables": {
-    "chef_version": "provisionerless",
     "mirror": "http://download.fedoraproject.org/pub/fedora/linux"
   }
 }