Skip to content

Commit f0bfd69

Browse files
committed
Remove dependency on OVN for Octavia
Octavia can be used with a 3rd party SDN, don't require OVN to be enabled JIRA: OSPRH-32131
1 parent ff9a1b4 commit f0bfd69

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

api/core/v1beta1/openstackcontrolplane_webhook.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,8 @@ func (r *OpenStackControlPlane) checkDepsEnabled(name string) string {
339339
case "Octavia":
340340
// TODO(beagles): So far we haven't declared Redis as dependency for Octavia, but we might.
341341
if !((r.Spec.Galera.Enabled) && r.Spec.Memcached.Enabled && r.Spec.Rabbitmq.Enabled &&
342-
r.Spec.Keystone.Enabled && r.Spec.Neutron.Enabled && r.Spec.Glance.Enabled && r.Spec.Nova.Enabled &&
343-
r.Spec.Ovn.Enabled) {
344-
reqs = "Galera, Memcached, RabbitMQ, Keystone, Glance, Neutron, Nova, OVN"
342+
r.Spec.Keystone.Enabled && r.Spec.Neutron.Enabled && r.Spec.Glance.Enabled && r.Spec.Nova.Enabled) {
343+
reqs = "Galera, Memcached, RabbitMQ, Keystone, Glance, Neutron, Nova"
345344
}
346345
case "Telemetry.Autoscaling":
347346
if !(r.Spec.Galera.Enabled && r.Spec.Heat.Enabled && r.Spec.Rabbitmq.Enabled && r.Spec.Keystone.Enabled) {

0 commit comments

Comments
 (0)