Skip to content

Commit 6e0edb3

Browse files
committed
Provide DatabaseInstance for Octavia if not explicitly set
Several of the operator integrations include a conditional to set a hardcoded-yet-consistent default DatabaseInstance value if it is not explicitly set for the component operator. This block was missing from the Octavia integration. Jira: OSPRH-12243
1 parent 4dd3ceb commit 6e0edb3

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

pkg/openstack/octavia.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,11 @@ func ReconcileOctavia(ctx context.Context, instance *corev1beta1.OpenStackContro
183183
octavia.Spec.Secret = instance.Spec.Secret
184184
}
185185

186+
if octavia.Spec.DatabaseInstance == "" {
187+
// octavia.Spec.DatabaseInstance = instance.Name // name of MariaDB we create here
188+
octavia.Spec.DatabaseInstance = "openstack" // FIXME: see above
189+
}
190+
186191
err := controllerutil.SetControllerReference(helper.GetBeforeObject(), octavia, helper.GetScheme())
187192
if err != nil {
188193
return err

0 commit comments

Comments
 (0)