Skip to content

Commit e3ba889

Browse files
committed
[test] fix keystone endpoint reconfigure test
There can be a race in the test when the keystoneapi endpoint changed, but we did not wait for the nova controller to start reconcile for it. If we then already simulate the top services and cell services the test will fail when it starts reconciling for the keystone endpoint change. This change waits for the controller start reconcile, before simulate the top services and cells to be ready. Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
1 parent 31c4459 commit e3ba889

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

test/functional/nova_reconfiguration_test.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,11 +1063,18 @@ var _ = Describe("Nova reconfiguration", func() {
10631063
keystone.UpdateKeystoneAPIEndpoint(novaNames.KeystoneAPIName, "internal", newInternalEndpoint)
10641064
logger.Info("Reconfigured")
10651065

1066+
// Wait for Nova controller to detect the keystone endpoint change and start updating components
1067+
// We check if the cell0 conductor gets the new KeystoneAuthURL
1068+
Eventually(func(g Gomega) {
1069+
// Check if cell0 conductor has been updated with the new KeystoneAuthURL
1070+
conductor := GetNovaConductor(cell0.ConductorName)
1071+
// The KeystoneAuthURL should match the new endpoint we set
1072+
g.Expect(conductor.Spec.KeystoneAuthURL).To(Equal(newInternalEndpoint))
1073+
}, timeout, interval).Should(Succeed())
1074+
10661075
SimulateReadyOfNovaTopServices()
1067-
th.SimulateJobSuccess(cell0.DBSyncJobName)
10681076
th.SimulateJobSuccess(cell1.DBSyncJobName)
10691077
th.SimulateJobSuccess(cell2.DBSyncJobName)
1070-
th.SimulateStatefulSetReplicaReady(cell0.ConductorStatefulSetName)
10711078

10721079
for _, cell := range []types.NamespacedName{cell0.ConductorName, cell1.ConductorName, cell2.ConductorName} {
10731080
Eventually(func(g Gomega) {

0 commit comments

Comments
 (0)