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

Remove VeeWee definitions from project #358

Merged
merged 4 commits into from
May 20, 2015
Merged

Remove VeeWee definitions from project #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce4cf23
Remove VeeWee definitions from project.
fnichol May 19, 2015
42c90e3
[debian-6.0.10-*] Update parallels-iso builder ISO location.
fnichol May 20, 2015
29efb8a
[debian-7.8-*] Update root URL location for 7.8 ISO.
fnichol May 20, 2015
ed6bfef
Update Thorfile to run Packer commands in root of project.
fnichol May 20, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ virtualfloppy.vfd
packer_cache
packer.log
.DS_Store
/packer-*/
31 changes: 14 additions & 17 deletions Thorfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,22 @@ class Packer < Thor


def build
Dir.chdir './packer' do

if options[:bits]
processor = options[:bits] == "64" ? "{amd64,x86_64}" : "i386"
else
processor = "*"
end
if options[:bits]
processor = options[:bits] == "64" ? "{amd64,x86_64}" : "i386"
else
processor = "*"
end

templates = Dir.glob("#{options[:os]}-#{options[:ver]}-#{processor}.json")
templates = Dir.glob("#{options[:os]}-#{options[:ver]}-#{processor}.json")

if options[:only]
templates.each do |template|
name = template.chomp(".json").split("-")
system "packer build -only=#{name[0]}-#{name[1]}-#{name[2]}-#{options[:only]} #{template}"
end
else
templates.each do |template|
system "packer build #{template}"
end
if options[:only]
templates.each do |template|
name = template.chomp(".json").split("-")
system "packer build -only=#{name[0]}-#{name[1]}-#{name[2]}-#{options[:only]} #{template}"
end
else
templates.each do |template|
system "packer build #{template}"
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion packer/centos-5.11-i386.json → centos-5.11-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
],
"post-processors": [
{
"output": "../builds/{{.Provider}}/opscode_centos-5.11-i386_chef-{{user `chef_version`}}.box",
"output": "builds/{{.Provider}}/opscode_centos-5.11-i386_chef-{{user `chef_version`}}.box",
"type": "vagrant"
}
],
Expand Down
2 changes: 1 addition & 1 deletion packer/centos-5.11-x86_64.json → centos-5.11-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
],
"post-processors": [
{
"output": "../builds/{{.Provider}}/opscode_centos-5.11_chef-{{user `chef_version`}}.box",
"output": "builds/{{.Provider}}/opscode_centos-5.11_chef-{{user `chef_version`}}.box",
"type": "vagrant"
}
],
Expand Down
2 changes: 1 addition & 1 deletion packer/centos-6.6-i386.json → centos-6.6-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
],
"post-processors": [
{
"output": "../builds/{{.Provider}}/opscode_centos-6.6-i386_chef-{{user `chef_version`}}.box",
"output": "builds/{{.Provider}}/opscode_centos-6.6-i386_chef-{{user `chef_version`}}.box",
"type": "vagrant"
}
],
Expand Down
2 changes: 1 addition & 1 deletion packer/centos-6.6-x86_64.json → centos-6.6-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
],
"post-processors": [
{
"output": "../builds/{{.Provider}}/opscode_centos-6.6_chef-{{user `chef_version`}}.box",
"output": "builds/{{.Provider}}/opscode_centos-6.6_chef-{{user `chef_version`}}.box",
"type": "vagrant"
}
],
Expand Down
2 changes: 1 addition & 1 deletion packer/centos-7.1-x86_64.json → centos-7.1-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
],
"post-processors": [
{
"output": "../builds/{{.Provider}}/opscode_centos-7.1_chef-{{user `chef_version`}}.box",
"output": "builds/{{.Provider}}/opscode_centos-7.1_chef-{{user `chef_version`}}.box",
"type": "vagrant"
}
],
Expand Down
10 changes: 5 additions & 5 deletions packer/debian-6.0.10-amd64.json → debian-6.0.10-amd64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,18 @@
"disk_size": 40960,
"guest_os_type": "debian",
"http_directory": "http",
"iso_checksum": "3f3ec3e1adb4c2904a1234799f4775c10cf47cce",
"iso_checksum": "f3e70528664f174a121b26491c59cd66daaf8274",
"iso_checksum_type": "sha1",
"iso_url": "{{user `mirror`}}/6.0.9/amd64/iso-cd/debian-6.0.9-amd64-CD-1.iso",
"iso_url": "{{user `mirror`}}/6.0.10/amd64/iso-cd/debian-6.0.10-amd64-CD-1.iso",
"ssh_username": "vagrant",
"ssh_password": "vagrant",
"ssh_port": 22,
"ssh_wait_timeout": "10000s",
"shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now",
"parallels_tools_flavor": "lin",
"prlctl_version_file": ".prlctl_version",
"vm_name": "packer-debian-6.0.9-amd64",
"output_directory": "packer-debian-6.0.9-amd64-parallels",
"vm_name": "packer-debian-6.0.10-amd64",
"output_directory": "packer-debian-6.0.10-amd64-parallels",
"prlctl": [
[ "set", "{{.Name}}", "--memsize", "384" ],
[ "set", "{{.Name}}", "--cpus", "1" ]
Expand All @@ -130,7 +130,7 @@
"post-processors": [
{
"type": "vagrant",
"output": "../builds/{{.Provider}}/opscode_debian-6.0.10_chef-{{user `chef_version`}}.box"
"output": "builds/{{.Provider}}/opscode_debian-6.0.10_chef-{{user `chef_version`}}.box"
}
],
"provisioners": [
Expand Down
10 changes: 5 additions & 5 deletions packer/debian-6.0.10-i386.json → debian-6.0.10-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,18 @@
"disk_size": 40960,
"guest_os_type": "debian",
"http_directory": "http",
"iso_checksum": "bc2886211bce0e9c54bdf779f21a35d5e5a122fd",
"iso_checksum": "e8f77720e30f669e731fe3166ad6c3d2da33d93a",
"iso_checksum_type": "sha1",
"iso_url": "{{user `mirror`}}/6.0.9/i386/iso-cd/debian-6.0.9-i386-CD-1.iso",
"iso_url": "{{user `mirror`}}/6.0.10/i386/iso-cd/debian-6.0.10-i386-CD-1.iso",
"ssh_username": "vagrant",
"ssh_password": "vagrant",
"ssh_port": 22,
"ssh_wait_timeout": "10000s",
"shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now",
"parallels_tools_flavor": "lin",
"prlctl_version_file": ".prlctl_version",
"vm_name": "packer-debian-6.0.9-i386",
"output_directory": "packer-debian-6.0.9-i386-parallels",
"vm_name": "packer-debian-6.0.10-i386",
"output_directory": "packer-debian-6.0.10-i386-parallels",
"prlctl": [
[ "set", "{{.Name}}", "--memsize", "384" ],
[ "set", "{{.Name}}", "--cpus", "1" ]
Expand All @@ -130,7 +130,7 @@
"post-processors": [
{
"type": "vagrant",
"output": "../builds/{{.Provider}}/opscode_debian-6.0.10-i386_chef-{{user `chef_version`}}.box"
"output": "builds/{{.Provider}}/opscode_debian-6.0.10-i386_chef-{{user `chef_version`}}.box"
}
],
"provisioners": [
Expand Down
4 changes: 2 additions & 2 deletions packer/debian-7.8-amd64.json → debian-7.8-amd64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"variables": {
"chef_version": "provisionerless",
"mirror": "http://cdimage.debian.org/debian-cd"
"mirror": "http://cdimage.debian.org/cdimage/archive"
},
"builders": [
{
Expand Down Expand Up @@ -129,7 +129,7 @@
"post-processors": [
{
"type": "vagrant",
"output": "../builds/{{.Provider}}/opscode_debian-7.8_chef-{{user `chef_version`}}.box"
"output": "builds/{{.Provider}}/opscode_debian-7.8_chef-{{user `chef_version`}}.box"
}
],
"provisioners": [
Expand Down
4 changes: 2 additions & 2 deletions packer/debian-7.8-i386.json → debian-7.8-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"variables": {
"chef_version": "provisionerless",
"mirror": "http://cdimage.debian.org/debian-cd"
"mirror": "http://cdimage.debian.org/cdimage/archive"
},
"builders": [
{
Expand Down Expand Up @@ -130,7 +130,7 @@
"post-processors": [
{
"type": "vagrant",
"output": "../builds/{{.Provider}}/opscode_debian-7.8-i386_chef-{{user `chef_version`}}.box"
"output": "builds/{{.Provider}}/opscode_debian-7.8-i386_chef-{{user `chef_version`}}.box"
}
],
"provisioners": [
Expand Down
4 changes: 0 additions & 4 deletions definitions/.common/minimize.sh
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions definitions/.common/session.rb
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions definitions/.common/sshd.sh
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions definitions/.common/vagrant.sh
View file
Open in desktop

This file was deleted.

Empty file removed definitions/.gitignore
View file
Open in desktop
Empty file.
21 changes: 0 additions & 21 deletions definitions/.windows/session.rb
View file
Open in desktop

This file was deleted.

Loading