From ed701ebbf3bf79a150f51d98522ab494eb8dc199 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 29 May 2025 13:29:57 -0700 Subject: [PATCH] kickstarts: some misc improvements Move the vnc password into ansible-private and change it Set post script to pull via https instead of http. http gets redirected and curl doesn't follow the redirect by default. Signed-off-by: Kevin Fenzi --- roles/kickstarts/templates/hardware-rhel-9-06disk.j2 | 4 ++-- roles/kickstarts/templates/hardware-rhel-9-08disk.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/kickstarts/templates/hardware-rhel-9-06disk.j2 b/roles/kickstarts/templates/hardware-rhel-9-06disk.j2 index 9d515c41b1..b28efa1f62 100644 --- a/roles/kickstarts/templates/hardware-rhel-9-06disk.j2 +++ b/roles/kickstarts/templates/hardware-rhel-9-06disk.j2 @@ -5,7 +5,7 @@ # System authorization information auth --enableshadow --passalgo=sha512 # Use network installation -vnc --password install +vnc --password "{{ kickstart_vnc_password }}" # Use network install url --url=https://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ repo --name=epel --baseurl=https://infrastructure.fedoraproject.org/pub/epel/9/Everything/x86_64/ @@ -104,6 +104,6 @@ zsh %post --nochroot --log=/mnt/sysimage/root/post.output --erroronfail mkdir /mnt/sysimage/root/tmp -chroot /mnt/sysimage /usr/bin/curl http://infrastructure.fedoraproject.org/rhel/ks/post/rhel9-post.sh -o /root/tmp/rhel9-post.sh +chroot /mnt/sysimage /usr/bin/curl https://infrastructure.fedoraproject.org/rhel/ks/post/rhel9-post.sh -o /root/tmp/rhel9-post.sh chroot /mnt/sysimage sh /root/tmp/rhel9-post.sh %end diff --git a/roles/kickstarts/templates/hardware-rhel-9-08disk.j2 b/roles/kickstarts/templates/hardware-rhel-9-08disk.j2 index 9e9b913118..682a311e61 100644 --- a/roles/kickstarts/templates/hardware-rhel-9-08disk.j2 +++ b/roles/kickstarts/templates/hardware-rhel-9-08disk.j2 @@ -5,7 +5,7 @@ # System authorization information auth --enableshadow --passalgo=sha512 # Use network installation -vnc --password install +vnc --password "{{ kickstart_vnc_password }}" # Use network install url --url=http://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ repo --name=epel --baseurl=http://infrastructure.fedoraproject.org/pub/epel/9/Everything/x86_64/ @@ -113,6 +113,6 @@ zsh %post --nochroot --log=/mnt/sysimage/root/post.output --erroronfail mkdir /mnt/sysimage/root/tmp -chroot /mnt/sysimage /usr/bin/curl http://infrastructure.fedoraproject.org/rhel/ks/post/rhel9-post.sh -o /root/tmp/rhel9-post.sh +chroot /mnt/sysimage /usr/bin/curl https://infrastructure.fedoraproject.org/rhel/ks/post/rhel9-post.sh -o /root/tmp/rhel9-post.sh chroot /mnt/sysimage sh /root/tmp/rhel9-post.sh %end