Move tls_server_name logic into a task for clarity

infrawatch · Jul 4, 2023 · 37ff9ed · 37ff9ed
1 parent 1460239
commit 37ff9ed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/roles/servicetelemetry/tasks/component_clouds.yml b/roles/servicetelemetry/tasks/component_clouds.yml
@@ -38,6 +38,17 @@
         elastic_pass: "{{ elasticsearch_es_elastic_user.resources[0].data[elastic_user] | b64decode }}"
       no_log: true
 
+    - name: Set elastic_tls_server_name from forwarding config if set
+      set_fact:
+        elastic_tls_server_name: "{{ servicetelemetry_vars.backends.events.elasticsearch.forwarding.tls_server_name }}"
+      when: servicetelemetry_vars.backends.events.elasticsearch.forwarding.tls_server_name != ""
+
+    # This sets the server name based on the host part of the URL between // and : (https://elasticsearch-host:9200)
+    - name: Set elastic_tls_server_name by parsing the host_url if it's not set in the config
+      set_fact:
+        elastic_tls_server_name: "{{ servicetelemetry_vars.backends.events.elasticsearch.forwarding.host_url.rpartition('//')[-1].partition(':')[0] }}"
+      when: servicetelemetry_vars.backends.events.elasticsearch.forwarding.tls_server_name == ""
+
     - name: Get the Elasticsearch TLS materials secret
       k8s_info:
         api_version: v1

diff --git a/roles/servicetelemetry/templates/manifest_smartgateway_events.j2 b/roles/servicetelemetry/templates/manifest_smartgateway_events.j2
@@ -18,7 +18,7 @@ spec:
       tlsClientCert: /config/certs/user.crt
       tlsClientKey: /config/certs/user.key
       tlsCaCert: /config/certs/ca.crt
-      tlsServerName: {{ (elasticsearch.forwarding.tls_server_name != "") | ternary(elasticsearch.forwarding.tls_server_name, elasticsearch.forwarding.host_url.rpartition("//")[-1].partition(":")[0]) }}
+      tlsServerName: {{ elastic_tls_server_name }}
       tlsSecretName: {{ elasticsearch.forwarding.tls_secret_name }}
       user: {{ elastic_user | default('elastic') }}
       password: {{ elastic_pass | default('') }}