From a3910442857f0c6463a7550eec26d9cb57838637 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Thu, 14 Jul 2016 13:22:57 -0500 Subject: [PATCH] Add Fedora 24 and dedupe kickstart scripts The last few versions are all the same. Call them latest --- fedora-22-i386.json | 2 +- fedora-22-x86_64.json | 2 +- fedora-23-i386.json | 2 +- fedora-23-x86_64.json | 2 +- fedora-24-i386.json | 176 ++++++++++++++++++++++ fedora-24-x86_64.json | 182 +++++++++++++++++++++++ http/fedora-23/ks.cfg | 42 ------ http/{fedora-22 => fedora-latest}/ks.cfg | 0 8 files changed, 362 insertions(+), 46 deletions(-) create mode 100644 fedora-24-i386.json create mode 100644 fedora-24-x86_64.json delete mode 100644 http/fedora-23/ks.cfg rename http/{fedora-22 => fedora-latest}/ks.cfg (100%) diff --git a/fedora-22-i386.json b/fedora-22-i386.json index a1e3071e9..8404a76c2 100644 --- a/fedora-22-i386.json +++ b/fedora-22-i386.json @@ -164,7 +164,7 @@ "iso_checksum": "5e3dfdff30667f3339d8b4e6ac0651c2e00c9417987848bef772cb92dbc823a5", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-DVD-i386-22.iso", - "ks_path": "fedora-22/ks.cfg", + "ks_path": "fedora-latest/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", diff --git a/fedora-22-x86_64.json b/fedora-22-x86_64.json index 68bbfaf09..ad0652c65 100644 --- a/fedora-22-x86_64.json +++ b/fedora-22-x86_64.json @@ -168,7 +168,7 @@ "iso_checksum": "b2acfa7c7c6b5d2f51d3337600c2e52eeaa1a1084991181c28ca30343e52e0df", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-DVD-x86_64-22.iso", - "ks_path": "fedora-22/ks.cfg", + "ks_path": "fedora-latest/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", diff --git a/fedora-23-i386.json b/fedora-23-i386.json index 4c4a29aae..872b3bdee 100644 --- a/fedora-23-i386.json +++ b/fedora-23-i386.json @@ -164,7 +164,7 @@ "iso_checksum": "aa2125b6351480ce82ace619925d897d0588195a3287ef74fb203b6eb34cbccf", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-DVD-i386-23.iso", - "ks_path": "fedora-23/ks.cfg", + "ks_path": "fedora-latest/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", diff --git a/fedora-23-x86_64.json b/fedora-23-x86_64.json index ed5cc79de..fa6c71ac3 100644 --- a/fedora-23-x86_64.json +++ b/fedora-23-x86_64.json @@ -169,7 +169,7 @@ "iso_checksum": "30758dc821d1530de427c9e35212bd79b058bd4282e64b7b34ae1a40c87c05ae", "iso_checksum_type": "sha256", "iso_name": "Fedora-Server-DVD-x86_64-23.iso", - "ks_path": "fedora-23/ks.cfg", + "ks_path": "fedora-latest/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", diff --git a/fedora-24-i386.json b/fedora-24-i386.json new file mode 100644 index 000000000..8f5a65436 --- /dev/null +++ b/fedora-24-i386.json @@ -0,0 +1,176 @@ +{ + "builders": [ + { + "boot_command": [ + " linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "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 shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "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 shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + " linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-core", + "http_directory": "http", + "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": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "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`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "environment_vars": [], + "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/fedora/fix-slow-dns.sh", + "scripts/fedora/build-tools.sh", + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "32", + "box_basename": "fedora-24-i386", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "93c0bfe6e6bf23ca22cc1a85636ed15834336ee40a57bfe374f0044ad2d864b0", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-dvd-i386-24-1.2.iso", + "ks_path": "fedora-latest/ks.cfg", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/24/Server/i386/iso", + "name": "fedora-24-i386", + "no_proxy": "{{env `no_proxy`}}", + "template": "fedora-24-i386", + "version": "2.0.TIMESTAMP" + } +} diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json new file mode 100644 index 000000000..5473ddd5b --- /dev/null +++ b/fedora-24-x86_64.json @@ -0,0 +1,182 @@ +{ + "builders": [ + { + "boot_command": [ + " linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_os_type": "Fedora_64", + "hard_drive_interface": "sata", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "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 shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "virtualbox-iso", + "vboxmanage": [ + [ + "modifyvm", + "{{.Name}}", + "--memory", + "{{ user `memory` }}" + ], + [ + "modifyvm", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "virtualbox_version_file": ".vbox_version", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-64", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "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 shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "tools_upload_flavor": "linux", + "type": "vmware-iso", + "vm_name": "{{ user `template` }}", + "vmx_data": { + "cpuid.coresPerSocket": "1", + "ethernet0.pciSlotNumber": "32", + "memsize": "{{ user `memory` }}", + "numvcpus": "{{ user `cpus` }}" + } + }, + { + "boot_command": [ + " linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "guest_os_type": "fedora-core", + "http_directory": "http", + "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": [ + [ + "set", + "{{.Name}}", + "--memsize", + "{{ user `memory` }}" + ], + [ + "set", + "{{.Name}}", + "--cpus", + "{{ user `cpus` }}" + ] + ], + "prlctl_version_file": ".prlctl_version", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "parallels-iso", + "vm_name": "{{ user `template` }}" + }, + { + "boot_command": [ + " linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}" + ], + "boot_wait": "10s", + "disk_size": "{{user `disk_size`}}", + "headless": "{{ user `headless` }}", + "http_directory": "http", + "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`}}-qemu", + "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", + "ssh_password": "vagrant", + "ssh_port": 22, + "ssh_username": "vagrant", + "ssh_wait_timeout": "10000s", + "type": "qemu", + "vm_name": "{{ user `template` }}" + } + ], + "post-processors": [ + { + "output": "builds/{{user `box_basename`}}.{{.Provider}}.box", + "type": "vagrant" + } + ], + "provisioners": [ + { + "destination": "/tmp/bento-metadata.json", + "source": "{{user `metadata`}}", + "type": "file" + }, + { + "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 -E -S bash '{{.Path}}'", + "scripts": [ + "scripts/common/metadata.sh", + "scripts/fedora/fix-slow-dns.sh", + "scripts/fedora/build-tools.sh", + "scripts/common/sshd.sh", + "scripts/common/vmtools.sh", + "scripts/common/vagrant.sh", + "scripts/fedora/cleanup.sh", + "scripts/common/minimize.sh" + ], + "type": "shell" + } + ], + "variables": { + "arch": "64", + "box_basename": "fedora-24", + "build_timestamp": "{{isotime \"20060102150405\"}}", + "cpus": "1", + "disk_size": "40960", + "git_revision": "__unknown_git_revision__", + "headless": "", + "http_proxy": "{{env `http_proxy`}}", + "https_proxy": "{{env `https_proxy`}}", + "iso_checksum": "1c0971d4c1a37bb06ec603ed3ded0af79e22069499443bb2d47e501c9ef42ae8", + "iso_checksum_type": "sha256", + "iso_name": "Fedora-Server-dvd-x86_64-24-1.2.iso", + "ks_path": "fedora-latest/ks.cfg", + "memory": "512", + "metadata": "floppy/dummy_metadata.json", + "mirror": "http://download.fedoraproject.org/pub/fedora/linux", + "mirror_directory": "releases/24/Server/x86_64/iso", + "name": "fedora-24", + "no_proxy": "{{env `no_proxy`}}", + "template": "fedora-24-x86_64", + "version": "2.0.TIMESTAMP" + } +} diff --git a/http/fedora-23/ks.cfg b/http/fedora-23/ks.cfg deleted file mode 100644 index fceea35a8..000000000 --- a/http/fedora-23/ks.cfg +++ /dev/null @@ -1,42 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw vagrant -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --permissive -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -firstboot --disabled -reboot -user --name=vagrant --plaintext --password vagrant - -%packages --ignoremissing --excludedocs -bzip2 -# GCC won't install during kickstart -# gcc -kernel-devel -kernel-headers -tar -wget -nfs-utils -net-tools -dnf-yum --linux-firmware --plymouth --plymouth-core-libs -%end - -%post -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant -%end diff --git a/http/fedora-22/ks.cfg b/http/fedora-latest/ks.cfg similarity index 100% rename from http/fedora-22/ks.cfg rename to http/fedora-latest/ks.cfg