Consolidate CentOS 7

sources/inputs.pkr.hcl

@@ -50,8 +50,8 @@ variable "build" {
 }
 
 variable "cd_files" {
-	type = list(string)
-	default = []
+	type = map(string)
+	default = {}
 }
 
 variable "cd_label" {
@@ -59,6 +59,11 @@ variable "cd_label" {
 	default = "cidata"
 }
 
+variable "http_files" {
+	type = map(string)
+	default = {}
+}
+
 locals {
 	name = "${var.distro}-${var.version}-${var.arch}"
 	description = templatefile("../README.box.md", {

sources/qemu.pkr.hcl

@@ -32,7 +32,7 @@ source "qemu" "x86_64" {
 	]
 	accelerator = var.qemu_accelerator
 
-	http_directory = "http"
-	cd_files = var.cd_files
+	http_content = var.http_files
+	cd_content = var.cd_files
 	cd_label = var.cd_label
 }

sources/virtualbox-iso.pkr.hcl

@@ -27,6 +27,7 @@ source "virtualbox-iso" "x86_64" {
 		["modifyvm", "{{ .Name }}", "--uartmode1", "file", "serial-output-virtualbox-${var.arch}-${var.distro}-${var.version}"]
 	]
 
-	http_directory = "http"
-	cd_files = [ "http/${var.cd_files_path}" ]
+	http_content = var.http_files
+	cd_content = var.cd_files
+	cd_label = var.cd_label
 }