From: David Galloway <dgallowa@redhat.com>
Date: Thu, 25 Aug 2022 18:28:50 +0000 (-0400)
Subject: Revert "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=5a7b1693da7afc6d18dead5693a67f85d24c82cf;p=ceph-cm-ansible.git

Revert "cobbler: Put CentOS9 Stream repos in place during kickstart"

This reverts commit 9d277d66e9e96bd2fe5d5490018536ebe0db8140.

This hack isn't needed with a newer CentOS 9 Stream ISO.

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

diff --git a/roles/cobbler/defaults/main.yml b/roles/cobbler/defaults/main.yml
index 26124fee..17092771 100644
--- a/roles/cobbler/defaults/main.yml
+++ b/roles/cobbler/defaults/main.yml
@@ -43,7 +43,6 @@ 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 17c255cf..b1b93cf4 100644
--- a/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
+++ b/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
@@ -87,10 +87,6 @@ $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 e2e95a11..3b61db73 100644
--- a/roles/cobbler/templates/kickstarts/cephlab_rhel_sdc.ks
+++ b/roles/cobbler/templates/kickstarts/cephlab_rhel_sdc.ks
@@ -101,10 +101,6 @@ $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 491b195d..06be6a3b 100644
--- a/roles/cobbler/templates/kickstarts/cephlab_rhel_sdi.ks
+++ b/roles/cobbler/templates/kickstarts/cephlab_rhel_sdi.ks
@@ -101,9 +101,6 @@ $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 97be7f86..744bd9fe 100644
--- a/roles/cobbler/templates/kickstarts/cephlab_rhel_sdm.ks
+++ b/roles/cobbler/templates/kickstarts/cephlab_rhel_sdm.ks
@@ -101,9 +101,6 @@ $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
deleted file mode 100644
index ef228637..00000000
--- a/roles/cobbler/templates/snippets/cephlab_centos9_repos
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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 3120bf55..0fa62f09 100644
--- a/roles/cobbler/templates/triggers/install/post/cephlab_ansible.sh
+++ b/roles/cobbler/templates/triggers/install/post/cephlab_ansible.sh
@@ -36,6 +36,10 @@ 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