Merge pull request #4405 from s-vipin/tfa-ceph-base-issue

[TFA] fix ceph-base package installation issues
red-hat-storage · Jan 28, 2025 · 239d53d · 239d53d
2 parents 952bf1d + 695214e
commit 239d53d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/conf/reef/rados/13-node-cluster-4-clients.yaml b/conf/reef/rados/13-node-cluster-4-clients.yaml
@@ -60,9 +60,6 @@ globals:
         no-of-volumes: 4
         disk-size: 15
       node7:
-        image-name:
-          openstack: RHEL-9.4.0-x86_64-ga-latest
-          ibmc: rhel-91-server-released
         networks:
           - shared_net_2
         role:

diff --git a/conf/reef/rados/stretch-mode-host-location-attrs.yaml b/conf/reef/rados/stretch-mode-host-location-attrs.yaml
@@ -70,5 +70,8 @@ globals:
         no-of-volumes: 4
         disk-size: 15
       node8:
+        image-name:
+          openstack: RHEL-9.4.0-x86_64-ga-latest
+          ibmc: rhel-91-server-released
         role:
           - client
diff --git a/conf/squid/rados/13-node-cluster-4-clients.yaml b/conf/squid/rados/13-node-cluster-4-clients.yaml
@@ -60,9 +60,6 @@ globals:
         no-of-volumes: 4
         disk-size: 15
       node7:
-        image-name:
-          openstack: RHEL-9.4.0-x86_64-ga-latest
-          ibmc: rhel-91-server-released
         networks:
           - shared_net_2
         role:

diff --git a/conf/squid/rados/stretch-mode-host-location-attrs.yaml b/conf/squid/rados/stretch-mode-host-location-attrs.yaml
@@ -70,5 +70,8 @@ globals:
         no-of-volumes: 4
         disk-size: 15
       node8:
+        image-name:
+          openstack: RHEL-9.4.0-x86_64-ga-latest
+          ibmc: rhel-91-server-released
         role:
           - client
diff --git a/suites/quincy/upstream/tier-2_rados_test-stretch-mode.yaml b/suites/quincy/upstream/tier-2_rados_test-stretch-mode.yaml
@@ -49,6 +49,18 @@ tests:
                 root: default
                 datacenter: DC2
             - service_type: mon
+              spec:
+                crush_locations:
+                  node1:
+                    - datacenter=tiebreaker
+                  node2:
+                    - datacenter=DC1
+                  node3:
+                    - datacenter=DC1
+                  node5:
+                    - datacenter=DC2
+                  node6:
+                    - datacenter=DC2
               placement:
                 label: mon
             - service_type: mgr
@@ -130,9 +142,7 @@ tests:
       config:
         command: add
         id: client.1                      # client Id (<type>.<Id>)
-        nodes:
-          - node8:
-              release: 6
+        nodes: node8
         install_packages:
           - ceph-common
           - ceph-base

diff --git a/suites/squid/rados/tier-2_rados_test-stretch-mode-upgrade.yaml b/suites/squid/rados/tier-2_rados_test-stretch-mode-upgrade.yaml
@@ -23,7 +23,7 @@ tests:
         base_cmd_args:
           verbose: true
         args:
-          rhcs-version: 6.1
+          rhcs-version: 8.0
           release: rc
           mon-ip: node1
           orphan-initial-daemons: true