Skip to content

Commit

Permalink
Avoid cloud-init iso conflict, rename data var
Browse files Browse the repository at this point in the history
  • Loading branch information
xorel committed Nov 1, 2023
1 parent 69a23ab commit 1042da0
Show file tree
Hide file tree
Showing 26 changed files with 92 additions and 66 deletions.
10 changes: 5 additions & 5 deletions packer/alma/alma.pkr.hcl
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Build cloud init iso
source "file" "user_data" {
source = "${var.input_dir}/cloud-init.yml"
target = "${var.input_dir}/userdata"
target = "${var.input_dir}/${var.appliance_name}-userdata"
}

build {
sources = ["sources.file.user_data"]

provisioner "shell-local" {
inline = [
"cloud-localds ${var.input_dir}/cloud-init.iso ${var.input_dir}/userdata",
"cloud-localds ${var.input_dir}/${var.appliance_name}-cloud-init.iso ${var.input_dir}/${var.appliance_name}-userdata",
]
}
}
Expand All @@ -20,8 +20,8 @@ source "qemu" "alma" {
memory = 2048
accelerator = "kvm"

iso_url = lookup(lookup(var.data, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.data, var.version, {}), "iso_checksum", "")
iso_url = lookup(lookup(var.alma, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.alma, var.version, {}), "iso_checksum", "")

headless = var.headless

Expand All @@ -35,7 +35,7 @@ source "qemu" "alma" {

qemuargs = [ ["-serial", "stdio"],
["-cpu", "host"],
["-cdrom", "${var.input_dir}/cloud-init.iso"]
["-cdrom", "${var.input_dir}/${var.appliance_name}-cloud-init.iso"]
]

ssh_username = "root"
Expand Down
2 changes: 1 addition & 1 deletion packer/alma/variables.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variable "headless" {
default = false
}

variable "data" {
variable "alma" {
type = map(map(string))

default = {
Expand Down
4 changes: 2 additions & 2 deletions packer/alpine/alpine.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ source "qemu" "alpine" {
memory = 2048
accelerator = "kvm"

iso_url = lookup(lookup(var.data, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.data, var.version, {}), "iso_checksum", "")
iso_url = lookup(lookup(var.alpine, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.alpine, var.version, {}), "iso_checksum", "")

headless = var.headless

Expand Down
2 changes: 1 addition & 1 deletion packer/alpine/variables.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variable "headless" {
default = false
}

variable "data" {
variable "alpine" {
type = map(map(string))

default = {
Expand Down
10 changes: 5 additions & 5 deletions packer/alt/alt.pkr.hcl
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Build cloud init iso
source "file" "user_data" {
source = "${var.input_dir}/cloud-init.yml"
target = "${var.input_dir}/userdata"
target = "${var.input_dir}/${var.appliance_name}-userdata"
}

build {
sources = ["sources.file.user_data"]

provisioner "shell-local" {
inline = [
"cloud-localds ${var.input_dir}/cloud-init.iso ${var.input_dir}/userdata",
"cloud-localds ${var.input_dir}/${var.appliance_name}-cloud-init.iso ${var.input_dir}/${var.appliance_name}-userdata",
]
}
}
Expand All @@ -20,8 +20,8 @@ source "qemu" "alt" {
memory = 2048
accelerator = "kvm"

iso_url = lookup(lookup(var.data, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.data, var.version, {}), "iso_checksum", "")
iso_url = lookup(lookup(var.alt, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.alt, var.version, {}), "iso_checksum", "")

headless = var.headless

Expand All @@ -35,7 +35,7 @@ source "qemu" "alt" {

qemuargs = [ ["-serial", "stdio"],
["-cpu", "host"],
["-cdrom", "${var.input_dir}/cloud-init.iso"]
["-cdrom", "${var.input_dir}/${var.appliance_name}-cloud-init.iso"]
]

ssh_username = "root"
Expand Down
2 changes: 1 addition & 1 deletion packer/alt/variables.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variable "headless" {
default = false
}

variable "data" {
variable "alt" {
type = map(map(string))

default = {
Expand Down
2 changes: 1 addition & 1 deletion packer/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ packer build -force \
"$INPUT_DIR" # loads all *.pkr.hcl from dir

# delete potential temporary cloud-init files
rm -f "$INPUT_DIR"/{cloud-init.iso,userdata} ||:
rm -f "$INPUT_DIR"/"$DISTRO_NAME"-{cloud-init.iso,userdata} ||:

# convert working image to the destination
qemu-img convert -c -O qcow2 "$OUTPUT_DIR/$DISTRO" "$DST"
Expand Down
17 changes: 8 additions & 9 deletions packer/debian/debian.pkr.hcl
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Build cloud init iso
source "file" "user_data" {
source = "${var.input_dir}/cloud-init.yml"
target = "${var.input_dir}/userdata"
target = "${var.input_dir}/${var.appliance_name}-userdata"
}

build {
sources = ["sources.file.user_data"]

provisioner "shell-local" {
inline = [
"cloud-localds ${var.input_dir}/cloud-init.iso ${var.input_dir}/userdata",
"cloud-localds ${var.input_dir}/${var.appliance_name}-cloud-init.iso ${var.input_dir}/${var.appliance_name}-userdata",
]
}
}
Expand All @@ -20,8 +20,8 @@ source "qemu" "debian" {
memory = 2048
accelerator = "kvm"

iso_url = lookup(lookup(var.data, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.data, var.version, {}), "iso_checksum", "")
iso_url = lookup(lookup(var.debian, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.debian, var.version, {}), "iso_checksum", "")

headless = var.headless

Expand All @@ -33,11 +33,10 @@ source "qemu" "debian" {

output_directory = var.output_dir

qemuargs = [
["-serial", "stdio"],
["-cpu", "host"],
["-cdrom", "${var.input_dir}/cloud-init.iso"]
]
qemuargs = [ ["-serial", "stdio"],
["-cpu", "host"],
["-cdrom", "${var.input_dir}/${var.appliance_name}-cloud-init.iso"]
]
ssh_username = "root"
ssh_password = "opennebula"
ssh_wait_timeout = "600s"
Expand Down
2 changes: 1 addition & 1 deletion packer/debian/variables.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variable "headless" {
default = false
}

variable "data" {
variable "debian" {
type = map(map(string))

default = {
Expand Down
4 changes: 2 additions & 2 deletions packer/devuan/devuan.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ source "qemu" "devuan" {
memory = 2048
accelerator = "kvm"

iso_url = lookup(lookup(var.data, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.data, var.version, {}), "iso_checksum", "")
iso_url = lookup(lookup(var.devuan, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.devuan, var.version, {}), "iso_checksum", "")

headless = var.headless

Expand Down
2 changes: 1 addition & 1 deletion packer/devuan/variables.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variable "headless" {
default = false
}

variable "data" {
variable "devuan" {
type = map(map(string))

default = {
Expand Down
17 changes: 8 additions & 9 deletions packer/fedora/fedora.pkr.hcl
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Build cloud init iso
source "file" "user_data" {
source = "${var.input_dir}/cloud-init.yml"
target = "${var.input_dir}/userdata"
target = "${var.input_dir}/${var.appliance_name}-userdata"
}

build {
sources = ["sources.file.user_data"]

provisioner "shell-local" {
inline = [
"cloud-localds ${var.input_dir}/cloud-init.iso ${var.input_dir}/userdata",
"cloud-localds ${var.input_dir}/${var.appliance_name}-cloud-init.iso ${var.input_dir}/${var.appliance_name}-userdata",
]
}
}
Expand All @@ -20,8 +20,8 @@ source "qemu" "fedora" {
memory = 2048
accelerator = "kvm"

iso_url = lookup(lookup(var.data, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.data, var.version, {}), "iso_checksum", "")
iso_url = lookup(lookup(var.fedora, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.fedora, var.version, {}), "iso_checksum", "")

headless = var.headless

Expand All @@ -33,11 +33,10 @@ source "qemu" "fedora" {

output_directory = var.output_dir

qemuargs = [
["-serial", "stdio"],
["-cpu", "host"],
["-cdrom", "${var.input_dir}/cloud-init.iso"]
]
qemuargs = [ ["-serial", "stdio"],
["-cpu", "host"],
["-cdrom", "${var.input_dir}/${var.appliance_name}-cloud-init.iso"]
]
ssh_username = "root"
ssh_password = "opennebula"
ssh_wait_timeout = "600s"
Expand Down
2 changes: 1 addition & 1 deletion packer/fedora/variables.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variable "headless" {
default = false
}

variable "data" {
variable "fedora" {
type = map(map(string))

default = {
Expand Down
4 changes: 2 additions & 2 deletions packer/freebsd/freebsd.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ source "qemu" "freebsd" {
memory = 2048
accelerator = "kvm"

iso_url = lookup(lookup(var.data, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.data, var.version, {}), "iso_checksum", "")
iso_url = lookup(lookup(var.freebsd, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.freebsd, var.version, {}), "iso_checksum", "")

headless = var.headless

Expand Down
2 changes: 1 addition & 1 deletion packer/freebsd/variables.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variable "headless" {
default = false
}

variable "data" {
variable "freebsd" {
type = map(map(string))

default = {
Expand Down
10 changes: 5 additions & 5 deletions packer/ol/ol.pkr.hcl
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Build cloud init iso
source "file" "user_data" {
source = "${var.input_dir}/cloud-init.yml"
target = "${var.input_dir}/userdata"
target = "${var.input_dir}/${var.appliance_name}-userdata"
}

build {
sources = ["sources.file.user_data"]

provisioner "shell-local" {
inline = [
"cloud-localds ${var.input_dir}/cloud-init.iso ${var.input_dir}/userdata",
"cloud-localds ${var.input_dir}/${var.appliance_name}-cloud-init.iso ${var.input_dir}/${var.appliance_name}-userdata",
]
}
}
Expand All @@ -20,8 +20,8 @@ source "qemu" "ol" {
memory = 2048
accelerator = "kvm"

iso_url = lookup(lookup(var.data, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.data, var.version, {}), "iso_checksum", "")
iso_url = lookup(lookup(var.ol, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.ol, var.version, {}), "iso_checksum", "")

headless = var.headless

Expand All @@ -35,7 +35,7 @@ source "qemu" "ol" {

qemuargs = [ ["-serial", "stdio"],
["-cpu", "host"],
["-cdrom", "${var.input_dir}/cloud-init.iso"]
["-cdrom", "${var.input_dir}/${var.appliance_name}-cloud-init.iso"]
]

ssh_username = "root"
Expand Down
2 changes: 1 addition & 1 deletion packer/ol/variables.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variable "headless" {
default = false
}

variable "data" {
variable "ol" {
type = map(map(string))

default = {
Expand Down
10 changes: 5 additions & 5 deletions packer/opensuse/opensuse.pkr.hcl
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Build cloud init iso
source "file" "user_data" {
source = "${var.input_dir}/cloud-init.yml"
target = "${var.input_dir}/userdata"
target = "${var.input_dir}/${var.appliance_name}-userdata"
}

build {
sources = ["sources.file.user_data"]

provisioner "shell-local" {
inline = [
"cloud-localds ${var.input_dir}/cloud-init.iso ${var.input_dir}/userdata",
"cloud-localds ${var.input_dir}/${var.appliance_name}-cloud-init.iso ${var.input_dir}/${var.appliance_name}-userdata",
]
}
}
Expand All @@ -20,8 +20,8 @@ source "qemu" "opensuse" {
memory = 2048
accelerator = "kvm"

iso_url = lookup(lookup(var.data, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.data, var.version, {}), "iso_checksum", "")
iso_url = lookup(lookup(var.opensuse, var.version, {}), "iso_url", "")
iso_checksum = lookup(lookup(var.opensuse, var.version, {}), "iso_checksum", "")

headless = var.headless

Expand All @@ -35,7 +35,7 @@ source "qemu" "opensuse" {

qemuargs = [ ["-serial", "stdio"],
["-cpu", "host"],
["-cdrom", "${var.input_dir}/cloud-init.iso"]
["-cdrom", "${var.input_dir}/${var.appliance_name}-cloud-init.iso"]
]

ssh_username = "root"
Expand Down
2 changes: 1 addition & 1 deletion packer/opensuse/variables.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variable "headless" {
default = false
}

variable "data" {
variable "opensuse" {
type = map(map(string))

default = {
Expand Down
File renamed without changes.
28 changes: 28 additions & 0 deletions packer/rhel/80-install-context.sh.9
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/usr/bin/env bash

# Downloads and installs the latest one-context package.

: "${CTX_SUFFIX:=.el9.noarch.rpm}"

exec 1>&2
set -o errexit -o nounset -o pipefail
set -x

if ! stat /context/one-context*$CTX_SUFFIX; then (
install -d /context/ && cd /context/
curl -fsSL https://api.github.com/repos/OpenNebula/addon-context-linux/releases \
| jq -r ".[0].assets[].browser_download_url | select(endswith(\"$CTX_SUFFIX\"))" \
| xargs -r -n1 curl -fsSLO
) fi

dnf install -y /context/one-context*$CTX_SUFFIX haveged open-vm-tools

systemctl enable haveged

# >>> Apply only on one-context >= 6.1 >>>
if ! rpm -q --queryformat '%{VERSION}' one-context | grep -E '^([1-5]\.|6\.0\.)'; then
dnf install -y --setopt=install_weak_deps=False NetworkManager systemd-networkd
fi
# <<< Apply only on one-context >= 6.1 <<<

sync
Loading

0 comments on commit 1042da0

Please sign in to comment.