From 06d1f0f9133311b00382f525373c27852c69ba3f Mon Sep 17 00:00:00 2001
From: weslambert <wlambertts@gmail.com>
Date: Thu, 2 Mar 2023 08:46:52 -0500
Subject: [PATCH] Update Curator configuration to align with requirements for
 Curator 8.0.x

---
 salt/curator/files/curator.yml | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/salt/curator/files/curator.yml b/salt/curator/files/curator.yml
index 76888c94f..549310d73 100644
--- a/salt/curator/files/curator.yml
+++ b/salt/curator/files/curator.yml
@@ -15,20 +15,25 @@
 ---
 # Remember, leave a key empty if there is no value.  None will be a string,
 # not a Python "NoneType"
-client:
-  hosts:
-    - {{elasticsearch}}
-  port: 9200
-  username: "{{ ES_USER }}"
-  password: "{{ ES_PASS }}"
-  url_prefix:
-  use_ssl: True
-  certificate:
-  client_cert:
-  client_key:
-  ssl_no_validate: True
-  timeout: 30
-  master_only: False
+elasticsearch:
+  client:
+    hosts:
+      - https://{{elasticsearch}}:9200
+    cloud_id:
+    ca_certs:
+    client_cert:
+    client_key:
+    verify_certs: False
+    request_timeout: 30
+  other_settings:
+    api_key:
+      id:
+      api_key:
+    master_only: False
+{%- if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %}
+    username: "{{ ES_USER }}"
+    password: "{{ ES_PASS }}"
+{%- endif %}
 
 logging:
   loglevel: INFO