From 7689c561f29f1b6dc23aaee43d8150aa27cf8a11 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 28 Sep 2022 09:39:58 -0700 Subject: [PATCH] Correct OTLP TLS configuration in jaeger The env variables we set for the TLS configuration were for the jaeger native gRPC server rather than the otlp server. This corrects the settings. Change-Id: Id8b9157a104af243ee62a9d0aadbe56d09ea4ae5 --- .../roles/jaeger/templates/docker-compose.yaml.j2 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/playbooks/roles/jaeger/templates/docker-compose.yaml.j2 b/playbooks/roles/jaeger/templates/docker-compose.yaml.j2 index 0209f37870..467e956041 100644 --- a/playbooks/roles/jaeger/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/jaeger/templates/docker-compose.yaml.j2 @@ -8,16 +8,16 @@ services: network_mode: host restart: always environment: - - COLLECTOR_OTLP_ENABLED=true - SPAN_STORAGE_TYPE=badger - BADGER_EPHEMERAL=false - BADGER_DIRECTORY_VALUE=/badger/data - BADGER_DIRECTORY_KEY=/badger/key - BADGER_SPAN_STORE_TTL=30d - - COLLECTOR_GRPC_TLS_ENABLED=true - - COLLECTOR_GRPC_TLS_CERT=/tls/certs/cert.pem - - COLLECTOR_GRPC_TLS_KEY=/tls/keys/key.pem - - COLLECTOR_GRPC_TLS_CLIENT_CA=/tls/certs/cacert.pem + - COLLECTOR_OTLP_ENABLED=true + - COLLECTOR_OTLP_GRPC_TLS_ENABLED=true + - COLLECTOR_OTLP_GRPC_TLS_CERT=/tls/certs/cert.pem + - COLLECTOR_OTLP_GRPC_TLS_KEY=/tls/keys/key.pem + - COLLECTOR_OTLP_GRPC_TLS_CLIENT_CA=/tls/certs/cacert.pem volumes: - /var/jaeger/badger:/badger - /var/jaeger/tls:/tls