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

DRY up opensuse #450

Merged
merged 2 commits into from
Sep 16, 2015
Merged

DRY up opensuse #450

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
4ec9ca5
DRY up opensuse
Sep 15, 2015
29c1a92
Adding missing no_proxy key
Sep 15, 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
47 changes: 30 additions & 17 deletions opensuse-13.2-i386.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@
"boot_command": [
"<esc><enter><wait>",
"linux netsetup=dhcp install=cd:/<wait>",
" lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>",
" lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>",
" textmode=1<wait>",
"<enter><wait>"
],
"boot_wait": "10s",
"disk_size": 20480,
"guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
"guest_os_type": "OpenSUSE",
"hard_drive_interface": "sata",
"headless": "{{ user `headless` }}",
"http_directory": "http",
"iso_checksum": "2ec28606829d6408efc5a79b70d1da738fdc09de",
"iso_checksum_type": "sha1",
"iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-i586.iso",
"output_directory": "packer-opensuse-13.2-i386-virtualbox",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
"iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
"output_directory": "packer-{{user `template`}}-virtualbox",
"shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p",
"ssh_password": "vagrant",
"ssh_port": 22,
Expand Down Expand Up @@ -45,7 +46,7 @@
"boot_command": [
"<esc><enter><wait>",
"linux netsetup=dhcp install=cd:/<wait>",
" lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>",
" lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>",
" textmode=1<wait>",
"<enter><wait>"
],
Expand All @@ -54,10 +55,10 @@
"guest_os_type": "opensuse",
"headless": "{{ user `headless` }}",
"http_directory": "http",
"iso_checksum": "2ec28606829d6408efc5a79b70d1da738fdc09de",
"iso_checksum_type": "sha1",
"iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-i586.iso",
"output_directory": "packer-opensuse-13.2-i386-vmware",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
"iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
"output_directory": "packer-{{user `template`}}-vmware",
"shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1",
"ssh_password": "vagrant",
"ssh_port": 22,
Expand All @@ -76,7 +77,7 @@
"boot_command": [
"<esc><enter><wait>",
"linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>",
" lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>",
" lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>",
" textmode=1<wait>",
"<enter><wait>"
],
Expand All @@ -85,10 +86,10 @@
"guest_os_type": "opensuse",
"headless": "{{ user `headless` }}",
"http_directory": "http",
"iso_checksum": "2ec28606829d6408efc5a79b70d1da738fdc09de",
"iso_checksum_type": "sha1",
"iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-i586.iso",
"output_directory": "packer-opensuse-13.2-i386-parallels",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
"iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
"output_directory": "packer-{{user `template`}}-parallels",
"parallels_tools_flavor": "lin",
"prlctl": [
[
Expand Down Expand Up @@ -127,7 +128,12 @@
"type": "file"
},
{
"environment_vars": [],
"environment_vars": [
"HOME_DIR=/home/vagrant",
"http_proxy={{user `http_proxy`}}",
"https_proxy={{user `https_proxy`}}",
"no_proxy={{user `no_proxy`}}"
],
"execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'",
"scripts": [
"scripts/common/metadata.sh",
Expand All @@ -145,15 +151,22 @@
],
"variables": {
"arch": "32",
"autoinst_cfg": "opensuse-13.2/autoinst.xml",
"box_basename": "opensuse-13.2-i386",
"build_timestamp": "{{isotime \"20060102150405\"}}",
"git_revision": "__unknown_git_revision__",
"headless": "",
"http_proxy": "{{env `http_proxy`}}",
"https_proxy": "{{env `https_proxy`}}",
"iso_checksum": "bada6d5b304a9ecbb9b27e0a02d0c347c72d91c32231c2594e4deb11a4d9ce55",
"iso_checksum_type": "sha256",
"iso_name": "openSUSE-13.2-DVD-i586.iso",
"metadata": "floppy/dummy_metadata.json",
"mirror": "http://download.opensuse.org/distribution",
"mirror_directory": "13.2/iso",
"name": "opensuse-13.2-i386",
"no_proxy": "{{env `no_proxy`}}",
"template": "opensuse-13.2-i386",
"version": "2.0.TIMESTAMP"
}
}

51 changes: 32 additions & 19 deletions opensuse-13.2-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@
"boot_command": [
"<esc><enter><wait>",
"linux netsetup=dhcp install=cd:/<wait>",
" lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>",
" lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>",
" textmode=1<wait>",
"<enter><wait>"
],
"boot_wait": "10s",
"disk_size": 20480,
"guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
"guest_os_type": "OpenSUSE_64",
"hard_drive_interface": "sata",
"headless": "{{ user `headless` }}",
"http_directory": "http",
"iso_checksum": "a1bd237ccfb07939953a9681607c99c00bc78d5d",
"iso_checksum_type": "sha1",
"iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-x86_64.iso",
"output_directory": "packer-opensuse-13.2-x86_64-virtualbox",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
"iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
"output_directory": "packer-{{user `template`}}-virtualbox",
"shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p",
"ssh_password": "vagrant",
"ssh_port": 22,
Expand Down Expand Up @@ -45,7 +46,7 @@
"boot_command": [
"<esc><enter><wait>",
"linux netsetup=dhcp install=cd:/<wait>",
" lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>",
" lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>",
" textmode=1<wait>",
"<enter><wait>"
],
Expand All @@ -54,10 +55,10 @@
"guest_os_type": "opensuse-64",
"headless": "{{ user `headless` }}",
"http_directory": "http",
"iso_checksum": "a1bd237ccfb07939953a9681607c99c00bc78d5d",
"iso_checksum_type": "sha1",
"iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-x86_64.iso",
"output_directory": "packer-opensuse-13.2-x86_64-vmware",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
"iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
"output_directory": "packer-{{user `template`}}-vmware",
"shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -h 1",
"ssh_password": "vagrant",
"ssh_port": 22,
Expand All @@ -76,7 +77,7 @@
"boot_command": [
"<esc><enter><wait>",
"linux netsetup=dhcp netdevice=eth0 install=cd:/<wait>",
" lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/opensuse-13.2/autoinst.xml<wait>",
" lang=en_US autoyast=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `autoinst_cfg`}}<wait>",
" textmode=1<wait>",
"<enter><wait>"
],
Expand All @@ -85,10 +86,10 @@
"guest_os_type": "opensuse",
"headless": "{{ user `headless` }}",
"http_directory": "http",
"iso_checksum": "a1bd237ccfb07939953a9681607c99c00bc78d5d",
"iso_checksum_type": "sha1",
"iso_url": "{{user `mirror`}}/13.2/iso/openSUSE-13.2-DVD-x86_64.iso",
"output_directory": "packer-opensuse-13.2-x86_64-parallels",
"iso_checksum": "{{user `iso_checksum`}}",
"iso_checksum_type": "{{user `iso_checksum_type`}}",
"iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
"output_directory": "packer-{{user `template`}}-parallels",
"parallels_tools_flavor": "lin",
"prlctl": [
[
Expand Down Expand Up @@ -127,7 +128,12 @@
"type": "file"
},
{
"environment_vars": [],
"environment_vars": [
"HOME_DIR=/home/vagrant",
"http_proxy={{user `http_proxy`}}",
"https_proxy={{user `https_proxy`}}",
"no_proxy={{user `no_proxy`}}"
],
"execute_command": "echo 'vagrant' | {{.Vars}} sudo -S -E sh '{{.Path}}'",
"scripts": [
"scripts/common/metadata.sh",
Expand All @@ -145,15 +151,22 @@
],
"variables": {
"arch": "64",
"box_basename": "opensuse-13.2-x86_64",
"autoinst_cfg": "opensuse-13.2/autoinst.xml",
"box_basename": "opensuse-13.2",
"build_timestamp": "{{isotime \"20060102150405\"}}",
"git_revision": "__unknown_git_revision__",
"headless": "",
"http_proxy": "{{env `http_proxy`}}",
"https_proxy": "{{env `https_proxy`}}",
"iso_checksum": "787b0a600e8304a9dda12a4f7ff89a08c9fc4b445215b9f91c52628eccdc3c40",
"iso_checksum_type": "sha256",
"iso_name": "openSUSE-13.2-DVD-x86_64.iso",
"metadata": "floppy/dummy_metadata.json",
"mirror": "http://download.opensuse.org/distribution",
"name": "opensuse-13.2-x86_64",
"mirror_directory": "13.2/iso",
"name": "opensuse-13.2",
"no_proxy": "{{env `no_proxy`}}",
"template": "opensuse-13.2-x86_64",
"version": "2.0.TIMESTAMP"
}
}