From 0cd3f70dd184c8a4175935ca1a13d85faab6749e Mon Sep 17 00:00:00 2001
From: Steven Hardy <steven.hardy@suse.com>
Date: Mon, 16 Dec 2024 14:11:09 +0000
Subject: [PATCH] metal3: downstream cluster EIB example fixes

Ensure jq is installed as it's needed for the manifest rke2-preinstall.service

Also ensure transactional-update timers are disabled since we won't be doing package
based updates.

Fixes: #394
Fixes: #471
(cherry picked from commit 82f3de73b3f545e103f9b1d44daab5b2c7bf59fa)
---
 asciidoc/product/atip-automated-provision.adoc | 12 +++++++++---
 asciidoc/quickstart/metal3.adoc                | 15 ++++++++++++---
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/asciidoc/product/atip-automated-provision.adoc b/asciidoc/product/atip-automated-provision.adoc
index b139e474..cdcae42b 100644
--- a/asciidoc/product/atip-automated-provision.adoc
+++ b/asciidoc/product/atip-automated-provision.adoc
@@ -128,12 +128,18 @@ operatingSystem:
       - time-sync.target
   users:
     - username: root
-      encryptedPassword: ${ROOT_PASSWORD}
+      encryptedPassword: $ROOT_PASSWORD
       sshKeys:
-      - ${USERKEY1}
+      - $USERKEY1
+  packages:
+    packageList:
+      - jq
+    sccRegistrationCode: $SCC_REGISTRATION_CODE
 ----
 
-`$\{ROOT_PASSWORD\}` is the encrypted password for the root user, which can be useful for test/debugging.  It can be generated with the `openssl passwd -6 PASSWORD` command
+Where `$SCC_REGISTRATION_CODE` is the registration code copied from https://scc.suse.com/[SUSE Customer Center], and the package list contains `jq` which is required.
+
+`$ROOT_PASSWORD` is the encrypted password for the root user, which can be useful for test/debugging.  It can be generated with the `openssl passwd -6 PASSWORD` command
 
 For the production environments, it is recommended to use the SSH keys that can be added to the users block replacing the `$\{USERKEY1\}` with the real SSH keys.
 
diff --git a/asciidoc/quickstart/metal3.adoc b/asciidoc/quickstart/metal3.adoc
index 2300ec12..38636c26 100644
--- a/asciidoc/quickstart/metal3.adoc
+++ b/asciidoc/quickstart/metal3.adoc
@@ -238,14 +238,23 @@ operatingSystem:
   systemd:
     disable:
       - rebootmgr
+      - transactional-update.timer
+      - transactional-update-cleanup.timer
   users:
     - username: root
-      encryptedPassword: ${ROOT_PASSWORD}
+      encryptedPassword: $ROOT_PASSWORD
       sshKeys:
-      - ${USERKEY1}
+      - $USERKEY1
+  packages:
+    packageList:
+      - jq
+  sccRegistrationCode: $SCC_REGISTRATION_CODE
 ----
 
-`$\{ROOT_PASSWORD\}` is the encrypted password for the root user, which can be useful for test/debugging.  It can be generated with the `openssl passwd -6 PASSWORD` command
+Where `$SCC_REGISTRATION_CODE` is the registration code copied from https://scc.suse.com/[SUSE Customer Center], and the package list contains `jq` w
+hich is required.
+
+`$ROOT_PASSWORD` is the encrypted password for the root user, which can be useful for test/debugging.  It can be generated with the `openssl passwd -6 PASSWORD` command
 
 For the production environments, it is recommended to use the SSH keys that can be added to the users block replacing the `$\{USERKEY1\}` with the real SSH keys.