Merge pull request #859 from openshift-cherrypick-robot/cherry-pick-856-to-18.0-fr5

openshift-merge-bot[bot] · web-flow · commit f1cd32508d78 · 2026-03-24T15:51:50.000Z
[18.0-fr5] [OSPRH-27068] Fix ceilometer compute agent TLS and Region config
diff --git a/internal/controller/ceilometer_controller.go b/internal/controller/ceilometer_controller.go
@@ -1397,6 +1397,7 @@ func (r *CeilometerReconciler) generateComputeServiceConfig(
 		"ceilometer_compute_image": instance.Spec.ComputeImage,
 		"ceilometer_ipmi_image":    instance.Spec.IpmiImage,
 		"TLS":                      false,
+		"Region":                   keystoneAPI.GetRegion(),
 	}
 
 	// Try to get Application Credential from the secret specified in the CR
@@ -1425,6 +1426,7 @@ func (r *CeilometerReconciler) generateComputeServiceConfig(
 		templateParameters["TLS"] = true
 		templateParameters["TlsCert"] = "/etc/ceilometer/tls/tls.crt"
 		templateParameters["TlsKey"] = "/etc/ceilometer/tls/tls.key"
+		templateParameters["CAFile"] = tls.DownstreamTLSCABundlePath
 	}
 
 	cms := []util.Template{
diff --git a/templates/ceilometercompute/config/ceilometer.conf b/templates/ceilometercompute/config/ceilometer.conf
@@ -24,6 +24,9 @@ interface = internalURL
 {{ if (index . "Region") -}}
 region_name = {{ .Region }}
 {{ end -}}
+{{- if .TLS }}
+cafile = {{ .CAFile }}
+{{- end }}
 
 [compute]
 instance_discovery_method=libvirt_metadata

Original file line number	Diff line number	Diff line change
`@@ -1397,6 +1397,7 @@ func (r *CeilometerReconciler) generateComputeServiceConfig(`
`1397`	`1397`	`"ceilometer_compute_image": instance.Spec.ComputeImage,`
`1398`	`1398`	`"ceilometer_ipmi_image": instance.Spec.IpmiImage,`
`1399`	`1399`	`"TLS": false,`
	`1400`	`+ "Region": keystoneAPI.GetRegion(),`
`1400`	`1401`	`}`
`1401`	`1402`
`1402`	`1403`	`// Try to get Application Credential from the secret specified in the CR`
`@@ -1425,6 +1426,7 @@ func (r *CeilometerReconciler) generateComputeServiceConfig(`
`1425`	`1426`	`templateParameters["TLS"] = true`
`1426`	`1427`	`templateParameters["TlsCert"] = "/etc/ceilometer/tls/tls.crt"`
`1427`	`1428`	`templateParameters["TlsKey"] = "/etc/ceilometer/tls/tls.key"`
	`1429`	`+ templateParameters["CAFile"] = tls.DownstreamTLSCABundlePath`
`1428`	`1430`	`}`
`1429`	`1431`
`1430`	`1432`	`cms := []util.Template{`