Move new vars into a "forwarding" section and remove the ext_

infrawatch · Jul 4, 2023 · 5ffaced · 5ffaced
1 parent efba27b
commit 5ffaced
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/roles/servicetelemetry/defaults/main.yml b/roles/servicetelemetry/defaults/main.yml
@@ -50,12 +50,13 @@ servicetelemetry_defaults:
     events:
       elasticsearch:
         enabled: false
-        ext_host_url: https://elasticsearch-es-http:9200
-        ext_tls_server_name: ""
-        ext_tls_secret_name: elasticsearch-es-cert
-        ext_user_secret_name: elasticsearch-es-elastic-user
-        ext_use_basic_auth: true
-        ext_use_tls: true
+        forwarding:
+          host_url: https://elasticsearch-es-http:9200
+          tls_server_name: ""
+          tls_secret_name: elasticsearch-es-cert
+          user_secret_name: elasticsearch-es-elastic-user
+          use_basic_auth: true
+          use_tls: true
         version: 7.16.1
         node_count: 1
         storage:

diff --git a/roles/servicetelemetry/tasks/component_clouds.yml b/roles/servicetelemetry/tasks/component_clouds.yml
@@ -26,7 +26,7 @@
         api_version: v1
         kind: Secret
         namespace: '{{ ansible_operator_meta.namespace }}'
-        name: '{{ servicetelemetry_vars.backends.events.elasticsearch.ext_user_secret_name }}'
+        name: '{{ servicetelemetry_vars.backends.events.elasticsearch.forwarding.user_secret_name }}'
       register: elasticsearch_es_elastic_user
 
     - name: Set Elasticsearch user for BasicAuth
@@ -43,7 +43,7 @@
         api_version: v1
         kind: Secret
         namespace: '{{ ansible_operator_meta.namespace }}'
-        name: '{{ servicetelemetry_vars.backends.events.elasticsearch.ext_tls_secret_name }}'
+        name: '{{ servicetelemetry_vars.backends.events.elasticsearch.forwarding.tls_secret_name }}'
       register: es_certs
 
     - when: es_certs[0].data[user.key] is not defined or es_certs[0].data[user.crt] is not defined
@@ -58,7 +58,7 @@
               apiVersion: v1
               kind: Secret
               metadata:
-                name: '{{ servicetelemetry_vars.backends.events.elasticsearch.ext_tls_secret_name }}'
+                name: '{{ servicetelemetry_vars.backends.events.elasticsearch.forwarding.tls_secret_name }}'
                 namespace: '{{ ansible_operator_meta.namespace }}'
               stringData:
                 user.crt: '{{ elastic_user_cert_dummy }}'

diff --git a/roles/servicetelemetry/templates/manifest_grafana_ds.j2 b/roles/servicetelemetry/templates/manifest_grafana_ds.j2
@@ -29,9 +29,9 @@ spec:
       access: proxy
       editable: true
       isDefault: false
-      url: {{ servicetelemetry_vars.backends.events.elasticsearch.ext_host_url }}
+      url: {{ servicetelemetry_vars.backends.events.elasticsearch.forwarding.host_url }}
       type: elasticsearch
-      basicAuth: {{ servicetelemetry_vars.backends.events.elasticsearch.ext_use_basic_auth }}
+      basicAuth: {{ servicetelemetry_vars.backends.events.elasticsearch.forwarding.use_basic_auth }}
       basicAuthUser: {{ elastic_user }}
       basicAuthPassword: {{ elastic_pass }}
       database: collectd_*
@@ -44,9 +44,9 @@ spec:
       access: proxy
       editable: true
       isDefault: false
-      url: {{ servicetelemetry_vars.backends.events.elasticsearch.ext_host_url }}
+      url: {{ servicetelemetry_vars.backends.events.elasticsearch.forwarding.host_url }}
       type: elasticsearch
-      basicAuth: {{ servicetelemetry_vars.backends.events.elasticsearch.ext_use_basic_auth }}
+      basicAuth: {{ servicetelemetry_vars.backends.events.elasticsearch.forwarding.use_basic_auth }}
       basicAuthUser: {{ elastic_user }}
       basicAuthPassword: {{ elastic_pass }}
       database: ceilometer_*

diff --git a/roles/servicetelemetry/templates/manifest_smartgateway_events.j2 b/roles/servicetelemetry/templates/manifest_smartgateway_events.j2
@@ -13,16 +13,16 @@ spec:
   size: {{ smartgateway_deployment_size }}
   applications:
   - config: |
-      hostURL: {{ elasticsearch.ext_host_url }}
-      useTLS: {{ elasticsearch.ext_use_tls }}
+      hostURL: {{ elasticsearch.forwarding.host_url }}
+      useTLS: {{ elasticsearch.forwarding.use_tls }}
       tlsClientCert: /config/certs/user.crt
       tlsClientKey: /config/certs/user.key
       tlsCaCert: /config/certs/ca.crt
-      tlsServerName: {{ (elasticsearch.ext_tls_server_name != "") | ternary(elasticsearch.ext_tls_server_name, elasticsearch.ext_host_url.rpartition("//")[-1].partition(":")[0]) }}
-      tlsSecretName: {{ elasticsearch.ext_tls_secret_name }}
+      tlsServerName: {{ (elasticsearch.forwarding.tls_server_name != "") | ternary(elasticsearch.forwarding.tls_server_name, elasticsearch.forwarding.host_url.rpartition("//")[-1].partition(":")[0]) }}
+      tlsSecretName: {{ elasticsearch.forwarding.tls_secret_name }}
       user: {{ elastic_user | default('elastic') }}
       password: {{ elastic_pass | default('') }}
-      useBasicAuth: {{ elasticsearch.ext_use_basic_auth }}
+      useBasicAuth: {{ elasticsearch.forwarding.use_basic_auth }}
     name: elasticsearch
   bridge:
     amqpUrl: amqp://{{ ansible_operator_meta.name }}-interconnect.{{ ansible_operator_meta.namespace }}.svc.cluster.local:5673/{{ this_collector.subscription_address }}