Skip to content

Commit

Permalink
Merge pull request #1222 from beagles/octavia-missing-db
Browse files Browse the repository at this point in the history
Provide DatabaseInstance for Octavia if not explicitly set
  • Loading branch information
openshift-merge-bot[bot] authored Dec 6, 2024
2 parents 4dd3ceb + 6e0edb3 commit 81df93f
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions pkg/openstack/octavia.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,11 @@ func ReconcileOctavia(ctx context.Context, instance *corev1beta1.OpenStackContro
octavia.Spec.Secret = instance.Spec.Secret
}

if octavia.Spec.DatabaseInstance == "" {
// octavia.Spec.DatabaseInstance = instance.Name // name of MariaDB we create here
octavia.Spec.DatabaseInstance = "openstack" // FIXME: see above
}

err := controllerutil.SetControllerReference(helper.GetBeforeObject(), octavia, helper.GetScheme())
if err != nil {
return err
Expand Down

0 comments on commit 81df93f

Please sign in to comment.