Skip to content

Commit 7d8bbb3

Browse files
authored
Revert "Check for Ceilometer and Autoscaling dependencies"
1 parent 5de8b1b commit 7d8bbb3

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

apis/core/v1beta1/openstackcontrolplane_webhook.go

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -167,14 +167,6 @@ func (r *OpenStackControlPlane) checkDepsEnabled(name string) string {
167167
r.Spec.Ovn.Enabled) {
168168
reqs = "Galera, Memcached, RabbitMQ, Keystone, Glance, Neutron, Nova, OVN"
169169
}
170-
case "Telemetry.Autoscaling":
171-
if !(r.Spec.Galera.Enabled && r.Spec.Heat.Enabled && r.Spec.Rabbitmq.Enabled && r.Spec.Keystone.Enabled) {
172-
reqs = "Galera, Heat, RabbitMQ, Keystone"
173-
}
174-
case "Telemetry.Ceilometer":
175-
if !(r.Spec.Rabbitmq.Enabled && r.Spec.Keystone.Enabled) {
176-
reqs = "RabbitMQ, Keystone"
177-
}
178170
}
179171

180172
// If "reqs" is not the empty string, we have missing requirements
@@ -392,20 +384,6 @@ func (r *OpenStackControlPlane) ValidateServiceDependencies(basePath *field.Path
392384
allErrs = append(allErrs, err)
393385
}
394386
}
395-
if r.Spec.Telemetry.Enabled && r.Spec.Telemetry.Template.Ceilometer.Enabled {
396-
if depErrorMsg := r.checkDepsEnabled("Telemetry.Ceilometer"); depErrorMsg != "" {
397-
err := field.Invalid(basePath.Child("telemetry").Child("template").Child("ceilometer").Child("enabled"),
398-
r.Spec.Telemetry.Template.Ceilometer.Enabled, depErrorMsg)
399-
allErrs = append(allErrs, err)
400-
}
401-
}
402-
if r.Spec.Telemetry.Enabled && r.Spec.Telemetry.Template.Autoscaling.Enabled {
403-
if depErrorMsg := r.checkDepsEnabled("Telemetry.Autoscaling"); depErrorMsg != "" {
404-
err := field.Invalid(basePath.Child("telemetry").Child("template").Child("autoscaling").Child("enabled"),
405-
r.Spec.Telemetry.Template.Autoscaling.Enabled, depErrorMsg)
406-
allErrs = append(allErrs, err)
407-
}
408-
}
409387

410388
return allErrs
411389
}

0 commit comments

Comments
 (0)