From 6158f0c52db74a9d7a8077ce549ec75eecb9fc20 Mon Sep 17 00:00:00 2001 From: Roberto Alfieri Date: Mon, 27 Jul 2026 17:17:42 +0200 Subject: [PATCH] Fix adoption order: adopt Cinder before Glance in test_with_ceph When glance_backend is set to 'cinder' (overriding the default 'ceph'), the Glance operator waits for Cinder resources to be ready before starting Glance pods. In the current role ordering, glance_adoption runs before cinder_adoption, causing a deadlock: Glance waits for Cinder, but Cinder hasn't been adopted yet. Move cinder_adoption before glance_adoption to match the ordering already used in test_minimal.yaml. This is safe because Cinder depends only on Keystone and MariaDB (both already adopted at this point), while Glance may depend on Cinder when configured with the cinder backend. Related-Issue: #OSPRH-32880 Co-authored-by: Cursor --- tests/playbooks/test_with_ceph.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/playbooks/test_with_ceph.yaml b/tests/playbooks/test_with_ceph.yaml index fa282e099..3de9a40fc 100644 --- a/tests/playbooks/test_with_ceph.yaml +++ b/tests/playbooks/test_with_ceph.yaml @@ -49,6 +49,9 @@ - role: neutron_adoption tags: - neutron_adoption + - role: cinder_adoption + tags: + - cinder_adoption - role: glance_adoption tags: - glance_adoption @@ -58,9 +61,6 @@ - role: nova_adoption tags: - nova_adoption - - role: cinder_adoption - tags: - - cinder_adoption - role: octavia_adoption tags: - octavia_adoption