Move everything off of Ansible
This commit is contained in:
+19
-10
@@ -26,20 +26,29 @@ build {
|
||||
"source.vmware-iso.x86_64"
|
||||
]
|
||||
|
||||
provisioner "ansible" {
|
||||
playbook_file = "ansible/playbook.yml"
|
||||
galaxy_file = "ansible/requirements.yml"
|
||||
user = local.ssh.username
|
||||
use_sftp = true
|
||||
ansible_ssh_extra_args = [
|
||||
#"-o", "HostKeyAlgorithms=+ssh-rsa",
|
||||
#"-o", "PubkeyAcceptedKeyTypes=+ssh-rsa",
|
||||
"-o", "IdentitiesOnly=yes"
|
||||
]
|
||||
# If anything needs specific support for one of the distros
|
||||
provisioner "shell" {
|
||||
execute_command = "sudo -S sh -c '{{ .Vars }} {{ .Path }}'"
|
||||
only = ["qemu.x86_64"]
|
||||
script = "distros/${var.distro}/${var.version}/qemu.sh"
|
||||
}
|
||||
provisioner "shell" {
|
||||
execute_command = "sudo -S sh -c '{{ .Vars }} {{ .Path }}'"
|
||||
only = ["virtualbox-iso.x86_64"]
|
||||
script = "distros/${var.distro}/${var.version}/virtualbox.sh"
|
||||
}
|
||||
provisioner "shell" {
|
||||
execute_command = "sudo -S sh -c '{{ .Vars }} {{ .Path }}'"
|
||||
only = ["vmware-iso.x86_64"]
|
||||
script = "distros/${var.distro}/${var.version}/vmware.sh"
|
||||
}
|
||||
|
||||
# Generic wrapping up the provisioner before packaging
|
||||
provisioner "shell" {
|
||||
execute_command = "sudo -S sh -c '{{ .Vars }} {{ .Path }}'"
|
||||
scripts = [
|
||||
"scripts/vagrant.sh",
|
||||
"distros/${var.distro}/${var.version}/finalize.sh",
|
||||
"scripts/minimize.sh"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -28,7 +28,11 @@ source "qemu" "x86_64" {
|
||||
|
||||
qemuargs = [
|
||||
#["-chardev", "stdio,id=char0,logfile=serial-output-qemu-${var.arch}-${var.distro}-${var.version},signal=off"],
|
||||
#["-serial", "chardev:char0"]
|
||||
#["-serial", "chardev:char0"],
|
||||
["-chardev", "socket,host=localhost,port=9876,server=on,wait=off,id=qga0"],
|
||||
["-device", "virtio-serial"],
|
||||
["-device", "virtserialport,chardev=qga0,name=org.qemu.guest_agent.0"],
|
||||
["-qmp", "tcp:localhost:4444,server,wait=off"],
|
||||
]
|
||||
accelerator = var.qemu_accelerator
|
||||
|
||||
|
||||
Reference in New Issue
Block a user