From 57b8bc56270f15bee0f196abb57a0b2f0ca3884d Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Thu, 1 May 2014 11:37:41 -0400 Subject: [PATCH] Update Fedora templates - Fixes #218 --- packer/fedora-19.json | 58 +++++++++----------------- packer/{scripts => http}/fedora/ks.cfg | 19 ++++----- packer/scripts/fedora/cleanup.sh | 5 --- packer/scripts/fedora/shutdown.sh | 1 - packer/scripts/fedora/sudoers.sh | 4 -- 5 files changed, 28 insertions(+), 59 deletions(-) rename packer/{scripts => http}/fedora/ks.cfg (75%) delete mode 100644 packer/scripts/fedora/cleanup.sh delete mode 100644 packer/scripts/fedora/shutdown.sh delete mode 100644 packer/scripts/fedora/sudoers.sh diff --git a/packer/fedora-19.json b/packer/fedora-19.json index c235f74cf..1ced6b9e6 100644 --- a/packer/fedora-19.json +++ b/packer/fedora-19.json @@ -2,16 +2,16 @@ "builders": [ { "boot_command": [ - " linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg" + " linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg" ], "boot_wait": "10s", - "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso", + "guest_additions_path": "VBoxGuestAdditions_{{ .Version }}.iso", "guest_os_type": "Fedora_64", "http_directory": "http", "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", - "output_directory": "packer-fedora-19-x86_64-virtualbox", + "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", + "output_directory": "chef-fedora-19-virtualbox", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -19,33 +19,24 @@ "ssh_wait_timeout": "10000s", "type": "virtualbox-iso", "vboxmanage": [ - [ - "modifyvm", - "{{.Name}}", - "--memory", - "512" - ], - [ - "modifyvm", - "{{.Name}}", - "--cpus", - "1" - ] + ["modifyvm", "{{ .Name }}", "--memory", "512"], + ["modifyvm", "{{ .Name }}", "--cpus", "1"] ], "virtualbox_version_file": ".vbox_version", - "vm_name": "packer-fedora-19-x86_64" + "vm_name": "chef-fedora-19-{{ timestamp }}" }, { "boot_command": [ - " linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora-19/ks.cfg" + " linux ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg" ], "boot_wait": "10s", "guest_os_type": "fedora-64", + "headless": true, "http_directory": "http", "iso_checksum": "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084", "iso_checksum_type": "sha256", - "iso_url": "{{user `mirror`}}/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", - "output_directory": "packer-fedora-19-x86_64-vmware", + "iso_url": "http://mirrors.kernel.org/fedora/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso", + "output_directory": "chef-fedora-19-vmware", "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, @@ -53,7 +44,7 @@ "ssh_wait_timeout": "10000s", "tools_upload_flavor": "linux", "type": "vmware-iso", - "vm_name": "packer-fedora-19-x86_64", + "vm_name": "chef-fedora-19-{{ timestamp }}", "vmx_data": { "cpuid.coresPerSocket": "1", "memsize": "512", @@ -63,31 +54,22 @@ ], "post-processors": [ { - "output": "../builds/{{.Provider}}/opscode_fedora-19_chef-{{user `chef_version`}}.box", - "type": "vagrant" + "output": "../builds/fedora-19/{{ .Provider }}/{{ timestamp }}.box", + "type": "vagrant", + "compression_level": 9 } ], "provisioners": [ { - "environment_vars": [ - "CHEF_VERSION={{user `chef_version`}}" - ], - "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'", + "type": "shell", + "execute_command": "echo 'vagrant' | {{ .Vars }} sudo -S -E 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" - ], - "type": "shell" + "scripts/rhel/cleanup.sh" + ] } - ], - "variables": { - "chef_version": "provisionerless", - "mirror": "http://mirrors.kernel.org/fedora" - } + ] } diff --git a/packer/scripts/fedora/ks.cfg b/packer/http/fedora/ks.cfg similarity index 75% rename from packer/scripts/fedora/ks.cfg rename to packer/http/fedora/ks.cfg index aee62b7f3..1319b9235 100644 --- a/packer/scripts/fedora/ks.cfg +++ b/packer/http/fedora/ks.cfg @@ -3,7 +3,7 @@ cdrom lang en_US.UTF-8 keyboard us network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ +rootpw vagrant firewall --disabled authconfig --enableshadow --passalgo=sha512 selinux --permissive @@ -22,28 +22,25 @@ bootloader --location=mbr --append="norhgb biosdevname=0" auth --useshadow --enablemd5 firstboot --disabled reboot +user --name=vagrant --plaintext --password vagrant -%packages -@Core +%packages --nobase --ignoremissing --excludedocs bzip2 gcc kernel-devel kernel-headers -openssl-devel -readline-devel tar wget -zlib-devel +net-tools nfs-utils +-linux-firmware +-plymouth +-plymouth-core-libs %end %post # update root certs -wget -O /etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant +wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem # sudo echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant diff --git a/packer/scripts/fedora/cleanup.sh b/packer/scripts/fedora/cleanup.sh deleted file mode 100644 index 13f3111e2..000000000 --- a/packer/scripts/fedora/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y remove gcc cpp kernel-devel kernel-headers perl -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/packer/scripts/fedora/shutdown.sh b/packer/scripts/fedora/shutdown.sh deleted file mode 100644 index bb7ec991b..000000000 --- a/packer/scripts/fedora/shutdown.sh +++ /dev/null @@ -1 +0,0 @@ -/sbin/halt -h -p diff --git a/packer/scripts/fedora/sudoers.sh b/packer/scripts/fedora/sudoers.sh deleted file mode 100644 index da3af2d5a..000000000 --- a/packer/scripts/fedora/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=sudo' /etc/sudoers -sed -i -e 's/%admin ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers