From: Ilya Dryomov <idryomov@gmail.com>
Date: Wed, 6 Apr 2022 10:43:11 +0000 (+0200)
Subject: testnode: make it clearer that centos_8.yml and centos_8_stream.yml get combined
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F676%2Fhead;p=ceph-cm-ansible.git

testnode: make it clearer that centos_8.yml and centos_8_stream.yml get combined

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/roles/testnode/vars/centos_8.yml b/roles/testnode/vars/centos_8.yml
index f3cca0ec..cd465f12 100644
--- a/roles/testnode/vars/centos_8.yml
+++ b/roles/testnode/vars/centos_8.yml
@@ -1,5 +1,6 @@
 ---
 # vars specific to any centos 8.x version
+# some of these will be overridden by vars in centos_8_stream.yml
 
 common_yum_repos:
   lab-extras:
diff --git a/roles/testnode/vars/centos_8_stream.yml b/roles/testnode/vars/centos_8_stream.yml
index d26b3e61..a6c8aef3 100644
--- a/roles/testnode/vars/centos_8_stream.yml
+++ b/roles/testnode/vars/centos_8_stream.yml
@@ -3,8 +3,10 @@
 # these will override vars in centos_8.yml
 
 packages_to_upgrade:
+  - libgcrypt # explicitly tied to qemu build
+
+  # centos stream additions start here
   - systemd
-  - libgcrypt
 
 packages:
   - redhat-lsb-core
@@ -57,4 +59,6 @@ packages:
   # for test-crash.sh
   - gdb
   - iozone
+
+  # centos stream additions start here
   - lvm2