Skip to content

Commit

Permalink
Use svc fqdn for ctlplane export
Browse files Browse the repository at this point in the history
  • Loading branch information
stuggi committed Aug 3, 2023
1 parent 69a1bff commit cebf3fe
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions controllers/openstackconfiggenerator_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,9 @@ func (r *OpenStackConfigGeneratorReconciler) Reconcile(ctx context.Context, req
}
}

svcDomain := "." + instance.Namespace + ".svc"
templateParameters["TripleoDeployFiles"] = tripleoDeployFiles
templateParameters["HeatServiceName"] = "heat-" + instance.Name + "." + instance.Namespace + ".svc"
templateParameters["HeatServiceName"] = "heat-" + instance.Name + svcDomain

//
// openstackconfig-script CM
Expand Down Expand Up @@ -511,7 +512,7 @@ func (r *OpenStackConfigGeneratorReconciler) Reconcile(ctx context.Context, req
return ctrl.Result{RequeueAfter: time.Second * 10}, nil
}
// obtain the cltplaneExports from Heat
exports, err = openstackconfiggenerator.CtlplaneExports("heat-"+instance.Name, r.Log)
exports, err = openstackconfiggenerator.CtlplaneExports("heat-"+instance.Name+svcDomain, r.Log)
if err != nil && !k8s_errors.IsNotFound(err) {
cond.Message = err.Error()
cond.Reason = shared.ConfigGeneratorCondReasonExportFailed
Expand Down

0 comments on commit cebf3fe

Please sign in to comment.