From 0b1a2dd1939428af2131490007a492c598363898 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Mon, 24 Apr 2023 14:40:30 +0800
Subject: [PATCH 1/2] feat: rename etcd.ssl to etcd.ssl_options

---
 apps/emqx_conf/src/emqx_conf.app.src    | 2 +-
 apps/emqx_conf/src/emqx_conf_schema.erl | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/emqx_conf/src/emqx_conf.app.src b/apps/emqx_conf/src/emqx_conf.app.src
index 234690374..03cd36522 100644
--- a/apps/emqx_conf/src/emqx_conf.app.src
+++ b/apps/emqx_conf/src/emqx_conf.app.src
@@ -1,6 +1,6 @@
 {application, emqx_conf, [
     {description, "EMQX configuration management"},
-    {vsn, "0.1.17"},
+    {vsn, "0.1.18"},
     {registered, []},
     {mod, {emqx_conf_app, []}},
     {applications, [kernel, stdlib, emqx_ctl]},
diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl
index f3f014321..abccca9fb 100644
--- a/apps/emqx_conf/src/emqx_conf_schema.erl
+++ b/apps/emqx_conf/src/emqx_conf_schema.erl
@@ -335,11 +335,12 @@ fields(cluster_etcd) ->
                     desc => ?DESC(cluster_etcd_node_ttl)
                 }
             )},
-        {"ssl",
+        {"ssl_options",
             sc(
                 ?R_REF(emqx_schema, "ssl_client_opts"),
                 #{
                     desc => ?DESC(cluster_etcd_ssl),
+                    alias => [ssl],
                     'readOnly' => true
                 }
             )}

From dacf92c4ab892867467d31f0d6cd947cd689a791 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Mon, 24 Apr 2023 14:45:53 +0800
Subject: [PATCH 2/2] chore: rename etcd.ssl changelog

---
 changes/ce/feat-10491.en.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/ce/feat-10491.en.md

diff --git a/changes/ce/feat-10491.en.md b/changes/ce/feat-10491.en.md
new file mode 100644
index 000000000..e1c38b6bb
--- /dev/null
+++ b/changes/ce/feat-10491.en.md
@@ -0,0 +1 @@
+Rename `etcd.ssl` to `etcd.ssl_options` to keep all of SSL options consistent in the configuration file.