From 0a4eb2d7378019c101c198679bf0a913fae5dbe6 Mon Sep 17 00:00:00 2001 From: Oliver Walsh Date: Wed, 14 May 2025 13:15:59 +0100 Subject: [PATCH] Propagate top-level extraMounts to Horizon and Keystone The other extraMounts consumers (Glance/Cinder/Neutron) already do this. Jira: OSPRH-15724 --- pkg/openstack/horizon.go | 9 +++++++++ pkg/openstack/keystone.go | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/pkg/openstack/horizon.go b/pkg/openstack/horizon.go index 5463a3afae..a7b9583134 100644 --- a/pkg/openstack/horizon.go +++ b/pkg/openstack/horizon.go @@ -157,6 +157,15 @@ func ReconcileHorizon(ctx context.Context, instance *corev1beta1.OpenStackContro horizon.Spec.Secret = instance.Spec.Secret } + // Append globally defined extraMounts to the service's own list. + for _, ev := range instance.Spec.ExtraMounts { + horizon.Spec.ExtraMounts = append(horizon.Spec.ExtraMounts, horizonv1.HorizonExtraVolMounts{ + Name: ev.Name, + Region: ev.Region, + VolMounts: ev.VolMounts, + }) + } + err := controllerutil.SetControllerReference(helper.GetBeforeObject(), horizon, helper.GetScheme()) if err != nil { return err diff --git a/pkg/openstack/keystone.go b/pkg/openstack/keystone.go index 2e60a0cade..b6b385ef20 100644 --- a/pkg/openstack/keystone.go +++ b/pkg/openstack/keystone.go @@ -128,6 +128,15 @@ func ReconcileKeystoneAPI(ctx context.Context, instance *corev1beta1.OpenStackCo keystoneAPI.Spec.DatabaseInstance = "openstack" //FIXME: see above } + // Append globally defined extraMounts to the service's own list. + for _, ev := range instance.Spec.ExtraMounts { + keystoneAPI.Spec.ExtraMounts = append(keystoneAPI.Spec.ExtraMounts, keystonev1.KeystoneExtraMounts{ + Name: ev.Name, + Region: ev.Region, + VolMounts: ev.VolMounts, + }) + } + err := controllerutil.SetControllerReference(helper.GetBeforeObject(), keystoneAPI, helper.GetScheme()) if err != nil { return err