Merge pull request openstack-k8s-operators#887 from stuggi/ephem_fqdn

Ephemeral heat communication use svc fqdn
stuggi · Aug 2, 2023 · 69a1bff · 69a1bff
2 parents ad28654 + 8f0843a
commit 69a1bff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/controllers/openstackconfiggenerator_controller.go b/controllers/openstackconfiggenerator_controller.go
@@ -299,7 +299,7 @@ func (r *OpenStackConfigGeneratorReconciler) Reconcile(ctx context.Context, req
 	}
 
 	templateParameters["TripleoDeployFiles"] = tripleoDeployFiles
-	templateParameters["HeatServiceName"] = "heat-" + instance.Name
+	templateParameters["HeatServiceName"] = "heat-" + instance.Name + "." + instance.Namespace + ".svc"
 
 	//
 	// openstackconfig-script CM

diff --git a/controllers/openstackephemeralheat_controller.go b/controllers/openstackephemeralheat_controller.go
@@ -297,8 +297,9 @@ func (r *OpenStackEphemeralHeatReconciler) generateServiceConfigMaps(
 	cmLabels := common.GetLabels(instance, openstackephemeralheat.AppLabel, map[string]string{})
 	envVars := make(map[string]common.EnvSetter)
 	templateParameters := make(map[string]interface{})
-	templateParameters["MariaDBHost"] = "mariadb-" + instance.Name
-	templateParameters["RabbitMQHost"] = "rabbitmq-" + instance.Name
+	svcDomain := "." + instance.Namespace + ".svc"
+	templateParameters["MariaDBHost"] = "mariadb-" + instance.Name + svcDomain
+	templateParameters["RabbitMQHost"] = "rabbitmq-" + instance.Name + svcDomain
 	templateParameters["MariaDBPassword"] = string(passwordSecret.Data["password"])
 
 	// ConfigMaps for all services (MariaDB/Rabbit/Heat)