From b6a776f4f4181e7524472f1f717ac3a117ac3797 Mon Sep 17 00:00:00 2001 From: Balazs Gibizer Date: Thu, 8 Feb 2024 12:05:26 +0100 Subject: [PATCH] Do not block Ready when OVN is disabled The fix f7fe693e253652a50174285c498d6b325059a5e4 introduced a regression. If OVN is disabled in OpenStackControlPlane CR then the CR will never become Ready. --- pkg/openstack/ovn.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/openstack/ovn.go b/pkg/openstack/ovn.go index 1b4f9c56b..5d060fe12 100644 --- a/pkg/openstack/ovn.go +++ b/pkg/openstack/ovn.go @@ -45,6 +45,8 @@ func ReconcileOVN(ctx context.Context, instance *corev1beta1.OpenStackControlPla // Expect all services (dbclusters, northd, ovn-controller) ready if OVNDBClustersReady && OVNNorthdReady && OVNControllerReady { instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneOVNReadyCondition, corev1beta1.OpenStackControlPlaneOVNReadyMessage) + } else if !instance.Spec.Ovn.Enabled { + instance.Status.Conditions.Remove(corev1beta1.OpenStackControlPlaneOVNReadyCondition) } else { instance.Status.Conditions.Set(condition.FalseCondition( corev1beta1.OpenStackControlPlaneOVNReadyCondition,