Merge pull request #856 from jlarriba/fix-ceilometer-compute-tls-config

[OSPRH-27068] Fix ceilometer compute agent TLS and Region config

Author: openshift-merge-bot[bot]

internal/controller/ceilometer_controller.go

@@ -1392,6 +1392,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
@@ -1420,6 +1421,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{

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