From 6cc7bc4ff510d3e340dcb638344eba5e28881ad0 Mon Sep 17 00:00:00 2001 From: Christian Schwede Date: Tue, 27 Feb 2024 11:01:40 +0100 Subject: [PATCH] Reconcile Barbican before Swift If Barbican is enabled it will be used by Swift to create and retrieve secrets, thus reconciling Barbican before Swift. --- controllers/core/openstackcontrolplane_controller.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/core/openstackcontrolplane_controller.go b/controllers/core/openstackcontrolplane_controller.go index 2d66fe3f1..6c23f0199 100644 --- a/controllers/core/openstackcontrolplane_controller.go +++ b/controllers/core/openstackcontrolplane_controller.go @@ -301,7 +301,7 @@ func (r *OpenStackControlPlaneReconciler) reconcileNormal(ctx context.Context, i return ctrlResult, nil } - ctrlResult, err = openstack.ReconcileSwift(ctx, instance, helper) + ctrlResult, err = openstack.ReconcileBarbican(ctx, instance, helper) if err != nil { return ctrl.Result{}, err } else if (ctrlResult != ctrl.Result{}) { @@ -329,7 +329,7 @@ func (r *OpenStackControlPlaneReconciler) reconcileNormal(ctx context.Context, i return ctrlResult, nil } - ctrlResult, err = openstack.ReconcileBarbican(ctx, instance, helper) + ctrlResult, err = openstack.ReconcileSwift(ctx, instance, helper) if err != nil { return ctrl.Result{}, err } else if (ctrlResult != ctrl.Result{}) {