Merge pull request #839 from openstack-k8s-operators/revert-837-check…

…_telemetry_deps

Revert "Check for Ceilometer and Autoscaling dependencies"

apis/core/v1beta1/openstackcontrolplane_webhook.go

@@ -167,14 +167,6 @@ func (r *OpenStackControlPlane) checkDepsEnabled(name string) string {
 			r.Spec.Ovn.Enabled) {
 			reqs = "Galera, Memcached, RabbitMQ, Keystone, Glance, Neutron, Nova, OVN"
 		}
-	case "Telemetry.Autoscaling":
-		if !(r.Spec.Galera.Enabled && r.Spec.Heat.Enabled && r.Spec.Rabbitmq.Enabled && r.Spec.Keystone.Enabled) {
-			reqs = "Galera, Heat, RabbitMQ, Keystone"
-		}
-	case "Telemetry.Ceilometer":
-		if !(r.Spec.Rabbitmq.Enabled && r.Spec.Keystone.Enabled) {
-			reqs = "RabbitMQ, Keystone"
-		}
 	}
 
 	// If "reqs" is not the empty string, we have missing requirements
@@ -392,20 +384,6 @@ func (r *OpenStackControlPlane) ValidateServiceDependencies(basePath *field.Path
 			allErrs = append(allErrs, err)
 		}
 	}
-	if r.Spec.Telemetry.Enabled && r.Spec.Telemetry.Template.Ceilometer.Enabled {
-		if depErrorMsg := r.checkDepsEnabled("Telemetry.Ceilometer"); depErrorMsg != "" {
-			err := field.Invalid(basePath.Child("telemetry").Child("template").Child("ceilometer").Child("enabled"),
-					     r.Spec.Telemetry.Template.Ceilometer.Enabled, depErrorMsg)
-			allErrs = append(allErrs, err)
-		}
-	}
-	if r.Spec.Telemetry.Enabled && r.Spec.Telemetry.Template.Autoscaling.Enabled {
-		if depErrorMsg := r.checkDepsEnabled("Telemetry.Autoscaling"); depErrorMsg != "" {
-			err := field.Invalid(basePath.Child("telemetry").Child("template").Child("autoscaling").Child("enabled"),
-					     r.Spec.Telemetry.Template.Autoscaling.Enabled, depErrorMsg)
-			allErrs = append(allErrs, err)
-		}
-	}
 
 	return allErrs
 }