From 44458ba332edb5fcc4a08a44f5327177be25f01f Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Fri, 9 Dec 2022 23:05:51 -0500 Subject: [PATCH] Use oci-utils from SIG/Cloud for now --- Rocky-9-OCP.ks | 3 ++- cloud/rocky-cloud-ocp-packages.ks | 1 + cloud/rocky-ocp.ks | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Rocky-9-OCP.ks b/Rocky-9-OCP.ks index 2d68ba6..1450850 100644 --- a/Rocky-9-OCP.ks +++ b/Rocky-9-OCP.ks @@ -15,6 +15,7 @@ text network --bootproto=dhcp --device=link --activate # Use network installation url --url="https://download.rockylinux.org/stg/rocky/9/BaseOS/$basearch/os/" +repo --name "sig-cloud-common" --baseurl=http://dl.rockylinux.org/stg/sig/9/cloud/$basearch/cloud-common/ --includepkgs="oci-utils" # System authorization information auth --enableshadow --passalgo=sha512 # Firewall configuration @@ -130,7 +131,6 @@ timeout 300; retry 60; EOF - # OCI - Import repo GPG key cat < /tmp/key -----BEGIN PGP PUBLIC KEY BLOCK----- @@ -386,6 +386,7 @@ python3-jsonschema qemu-guest-agent rng-tools rocky-release +rocky-release-cloud rsync tar yum diff --git a/cloud/rocky-cloud-ocp-packages.ks b/cloud/rocky-cloud-ocp-packages.ks index c31b450..7d99401 100644 --- a/cloud/rocky-cloud-ocp-packages.ks +++ b/cloud/rocky-cloud-ocp-packages.ks @@ -56,5 +56,6 @@ cockpit-system iscsi-initiator-utils rocky-release +rocky-release-cloud rng-tools %end diff --git a/cloud/rocky-ocp.ks b/cloud/rocky-ocp.ks index 04eefc3..791b019 100644 --- a/cloud/rocky-ocp.ks +++ b/cloud/rocky-ocp.ks @@ -2,6 +2,8 @@ %include rocky-cloud-parts-lvm.ks %include rocky-cloud-ocp-packages.ks +repo --name "sig-cloud-common" --baseurl=http://dl.rockylinux.org/stg/sig/9/cloud/$basearch/cloud-common/ --includepkgs="oci-utils" + bootloader --append="console=ttyS0,115200n8 console=tty0 no_timer_check crashkernel=auto net.ifnames=0 LANG=en_US.UTF-8 transparent_hugepage=never rd.luks=0 rd.md=0 rd.dm=0 rd.lvm.vg=rocky rd.lvm.lv=rocky/root rd.net.timeout.dhcp=10" --location=mbr --timeout=1 --boot-drive=vda %post --erroronfail