From 09b59f423daf2b481f49b6daff80828e9955d4f7 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Fri, 25 Oct 2019 14:18:15 +0200 Subject: centos-7-x86_64.json: formatting --- centos-7-x86_64.json | 59 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/centos-7-x86_64.json b/centos-7-x86_64.json index c9fd270..d6aff09 100644 --- a/centos-7-x86_64.json +++ b/centos-7-x86_64.json @@ -1,42 +1,43 @@ { "variables": { - "iso_url": "http://mirror2.hs-esslingen.de/centos/7/isos/x86_64/CentOS-7-x86_64-NetInstall-1908.iso", - "iso_checksum_url": "http://mirror2.hs-esslingen.de/centos/7/isos/x86_64/sha256sum.txt", - "iso_checksum_type": "sha256", - "vm_name": "centos-7-x86_64", - "http_dir": "http", - "kickstart_path": "centos-7/anaconda-ks.cfg", - "shutdown_command": "systemctl poweroff", - "ssh_password": "{{ env `ROOTPW` }}" + "iso_base_url": "http://mirror2.hs-esslingen.de/centos/7/isos/x86_64", + "iso_url": "{{ user `iso_base_url` }}/CentOS-7-x86_64-NetInstall-1908.iso", + "iso_checksum_url": "{{ user `iso_base_url` }}/sha256sum.txt", + "iso_checksum_type": "sha256", + "vm_name": "centos-7-x86_64", + "http_dir": "http", + "kickstart_path": "centos-7/anaconda-ks.cfg", + "shutdown_command": "systemctl poweroff", + "ssh_password": "{{ env `ROOTPW` }}" }, "builders": [{ - "type": "qemu", - "accelerator": "kvm", - "iso_url": "{{ user `iso_url` }}", - "iso_checksum_url": "{{ user `iso_checksum_url` }}", - "iso_checksum_type": "{{ user `iso_checksum_type` }}", - "output_directory": "{{ user `output_directory` }}", - "vm_name": "{{ user `vm_name` }}", - "format": "qcow2", - "disk_size": "{{ user `disk_size` }}", - "disk_interface": "virtio-scsi", - "headless": "{{ user `headless` }}", - "http_directory": "{{ user `http_dir` }}", + "type": "qemu", + "accelerator": "kvm", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum_url": "{{ user `iso_checksum_url` }}", + "iso_checksum_type": "{{ user `iso_checksum_type` }}", + "output_directory": "{{ user `output_directory` }}", + "vm_name": "{{ user `vm_name` }}", + "disk_size": "{{ user `disk_size` }}", + "format": "qcow2", + "disk_interface": "virtio-scsi", + "headless": "{{ user `headless` }}", + "http_directory": "{{ user `http_dir` }}", + "boot_wait": "{{ user `boot_wait` }}", + "ssh_timeout": "{{ user `ssh_timeout` }}", + "ssh_username": "{{ user `ssh_username` }}", + "ssh_password": "{{ user `ssh_password` }}", + "shutdown_command": "{{ user `shutdown_command` }}", + "qemuargs": [ + ["-m", "{{ user `memory` }}"], + ["-smp", "{{ user `cpus` }}"] + ], "boot_command": [ "", "linux inst.gpt biosdevname=0 net.ifnames=0 ", "rootpw={{ user `ssh_password` }} ", "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `kickstart_path` }}", "" - ], - "boot_wait": "{{ user `boot_wait` }}", - "ssh_timeout": "{{ user `ssh_timeout` }}", - "ssh_username": "{{ user `ssh_username` }}", - "ssh_password": "{{ user `ssh_password` }}", - "shutdown_command": "{{ user `shutdown_command` }}", - "qemuargs": [ - ["-m", "{{ user `memory` }}"], - ["-smp", "{{ user `cpus` }}"] ] }, { "type": "virtualbox-iso", -- cgit v1.2.3-55-g7522