Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove chef_version user variable & remove Chef installation option. #362

Merged
merged 2 commits into from
May 26, 2015
Merged

Remove chef_version user variable & remove Chef installation option. #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02aa8c4
Remove `chef_version` user variable & remove Chef installation option.
fnichol May 26, 2015
1f60142
Remove scripts/common/chef.sh as it is no longer invoked.
fnichol May 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions centos-5.11-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link

Choose a reason for hiding this comment

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

These kinds of strings are hardcoded here:

https://github.com/test-kitchen/kitchen-vagrant/blob/master/lib/kitchen/driver/vagrant.rb#L112

Needs to still be "_chef-provisionerless.box"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, that's a good catch. I'm hoping to update kitchen-vagrant just as soon as we can get boxes publishing up to Atlas. That could mean in the very short term that the box would have to be renamed when uploading to the S3 bucket. About 2 PRs down the road, I'm hoping to change the box file names even more so this is going to be important to keep in mind.

"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"
}
}
Expand Down
8 changes: 2 additions & 6 deletions centos-5.11-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down
8 changes: 2 additions & 6 deletions centos-6.6-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down
8 changes: 2 additions & 6 deletions centos-6.6-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down
8 changes: 2 additions & 6 deletions centos-7.1-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down
8 changes: 2 additions & 6 deletions debian-6.0.10-amd64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
Expand Down
8 changes: 2 additions & 6 deletions debian-6.0.10-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
Expand Down
8 changes: 2 additions & 6 deletions debian-7.8-amd64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
Expand Down
8 changes: 2 additions & 6 deletions debian-7.8-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
Expand Down
8 changes: 2 additions & 6 deletions fedora-20-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -125,7 +122,6 @@
}
],
"variables": {
"chef_version": "provisionerless",
"mirror": "http://download.fedoraproject.org/pub/fedora/linux"
}
}
Expand Down
8 changes: 2 additions & 6 deletions fedora-20-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -125,7 +122,6 @@
}
],
"variables": {
"chef_version": "provisionerless",
"mirror": "http://download.fedoraproject.org/pub/fedora/linux"
}
}
Expand Down
8 changes: 2 additions & 6 deletions fedora-21-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -125,7 +122,6 @@
}
],
"variables": {
"chef_version": "provisionerless",
"mirror": "http://download.fedoraproject.org/pub/fedora/linux"
}
}
Expand Down
Loading