Merge pull request #659 from mgirgisf/ceilometr-computeNode-tls

Enable prom-exporter with TLs

Author: openshift-merge-bot[bot]

controllers/ceilometer_controller.go

@@ -1304,6 +1304,13 @@ func (r *CeilometerReconciler) generateComputeServiceConfig(
 		"CeilometerPassword":       string(ceilometerPasswordSecret.Data["CeilometerPassword"]),
 		"ceilometer_compute_image": instance.Spec.ComputeImage,
 		"ceilometer_ipmi_image":    instance.Spec.IpmiImage,
+		"TLS":                      false,
+	}
+
+	if instance.Spec.TLS.Enabled() {
+		templateParameters["TLS"] = true
+		templateParameters["TlsCert"] = "/etc/ceilometer/tls/tls.crt"
+		templateParameters["TlsKey"] = "/etc/ceilometer/tls/tls.key"
 	}
 
 	cms := []util.Template{

templates/ceilometercompute/config/ceilometer.conf

@@ -31,6 +31,11 @@ topics=notifications
 
 [polling]
 heartbeat_socket_dir=/var/lib/ceilometer
+{{- if .TLS }}
+prometheus_tls_enable = True
+prometheus_tls_certfile = {{ .TlsCert }}
+prometheus_tls_keyfile = {{ .TlsKey }}
+{{- end }}
 enable_notifications=False
 enable_prometheus_exporter=true
 prometheus_listen_addresses='0.0.0.0:9101'