From: David Galloway <dgallowa@redhat.com>
Date: Wed, 24 Aug 2022 21:40:40 +0000 (-0400)
Subject: cobbler: Put CentOS9 Stream repos in place during kickstart
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F701%2Fhead;p=ceph-cm-ansible.git

cobbler: Put CentOS9 Stream repos in place during kickstart

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/roles/cobbler/defaults/main.yml b/roles/cobbler/defaults/main.yml
index 17092771..26124fee 100644
--- a/roles/cobbler/defaults/main.yml
+++ b/roles/cobbler/defaults/main.yml
@@ -43,6 +43,7 @@ snippets:
   - cephlab_rhel_disks
   - cephlab_post_install_kernel_options
   - cephlab_rhel_rhsm
+  - cephlab_centos9_repos
 
 scripts:
   - cephlab_preseed_late
diff --git a/roles/cobbler/templates/kickstarts/cephlab_rhel.ks b/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
index b1b93cf4..17c255cf 100644
--- a/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
+++ b/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
@@ -87,6 +87,10 @@ $SNIPPET('cephlab_user')
 $SNIPPET('cephlab_rhel_rhsm')
 #end if
 #if distro_ver_minor == 'stream'
+# Put CentOS 9 Stream repos in place
+#if int($distro_ver_major) == 9
+$SNIPPET('cephlab_centos9_repos')
+#end if
 # We want the latest packages because it's Stream
 yum -y update
 #else
diff --git a/roles/cobbler/templates/kickstarts/cephlab_rhel_sdc.ks b/roles/cobbler/templates/kickstarts/cephlab_rhel_sdc.ks
index 3b61db73..e2e95a11 100644
--- a/roles/cobbler/templates/kickstarts/cephlab_rhel_sdc.ks
+++ b/roles/cobbler/templates/kickstarts/cephlab_rhel_sdc.ks
@@ -101,6 +101,10 @@ $SNIPPET('cephlab_user')
 $SNIPPET('cephlab_rhel_rhsm')
 #end if
 #if distro_ver_minor == 'stream'
+# Put CentOS 9 Stream repos in place
+#if int($distro_ver_major) == 9
+$SNIPPET('cephlab_centos9_repos')
+#end if
 # We want the latest packages because it's Stream
 yum -y update
 #else
diff --git a/roles/cobbler/templates/kickstarts/cephlab_rhel_sdi.ks b/roles/cobbler/templates/kickstarts/cephlab_rhel_sdi.ks
index 06be6a3b..491b195d 100644
--- a/roles/cobbler/templates/kickstarts/cephlab_rhel_sdi.ks
+++ b/roles/cobbler/templates/kickstarts/cephlab_rhel_sdi.ks
@@ -101,6 +101,9 @@ $SNIPPET('cephlab_user')
 $SNIPPET('cephlab_rhel_rhsm')
 #end if
 #if distro_ver_minor == 'stream'
+#if int($distro_ver_major) == 9
+$SNIPPET('cephlab_centos9_repos')
+#end if
 # We want the latest packages because it's Stream
 yum -y update
 #else
diff --git a/roles/cobbler/templates/kickstarts/cephlab_rhel_sdm.ks b/roles/cobbler/templates/kickstarts/cephlab_rhel_sdm.ks
index 744bd9fe..97be7f86 100644
--- a/roles/cobbler/templates/kickstarts/cephlab_rhel_sdm.ks
+++ b/roles/cobbler/templates/kickstarts/cephlab_rhel_sdm.ks
@@ -101,6 +101,9 @@ $SNIPPET('cephlab_user')
 $SNIPPET('cephlab_rhel_rhsm')
 #end if
 #if distro_ver_minor == 'stream'
+#if int($distro_ver_major) == 9
+$SNIPPET('cephlab_centos9_repos')
+#end if
 # We want the latest packages because it's Stream
 yum -y update
 #else
diff --git a/roles/cobbler/templates/snippets/cephlab_centos9_repos b/roles/cobbler/templates/snippets/cephlab_centos9_repos
new file mode 100644
index 00000000..ef228637
--- /dev/null
+++ b/roles/cobbler/templates/snippets/cephlab_centos9_repos
@@ -0,0 +1,20 @@
+# For some reason, when kickstarting a CentOS 9 installation,
+# BaseOS and AppStream repos are missing out the gate.
+
+cat >> /etc/yum.repos.d/CentOS-BaseOS.repo << EOF
+[CentOS-Base]
+baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/BaseOS/$basearch/os/
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+name=CentOS-$releasever - Base
+EOF
+
+cat >> /etc/yum.repos.d/CentOS-AppStream.repo << EOF
+[CentOS-AppStream]
+baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/AppStream/$basearch/os/
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+name=CentOS-$releasever - AppStream
+EOF
diff --git a/roles/cobbler/templates/triggers/install/post/cephlab_ansible.sh b/roles/cobbler/templates/triggers/install/post/cephlab_ansible.sh
index 0fa62f09..3120bf55 100644
--- a/roles/cobbler/templates/triggers/install/post/cephlab_ansible.sh
+++ b/roles/cobbler/templates/triggers/install/post/cephlab_ansible.sh
@@ -36,10 +36,6 @@ export ANSIBLE_HOST_KEY_CHECKING=False
 if [[ $profile == *"8.stream"* ]]
 then
     ansible-playbook tools/convert-to-centos-stream.yml -v --limit $name* 2>&1 >> /var/log/ansible/$name.log
-elif [[ $profile == *"9.stream"* ]]
-then
-    # For some reason, we end up with no repos on the first boot without doing this.
-    ansible-playbook testnodes.yml --tags repos -v --limit $name* 2>&1 >> /var/log/ansible/$name.log
 fi
 
 # Tell ansible to create users, populate authorized_keys, and zap non-root disks