2 files changed, 19 insertions, 10 deletions
diff --git a/test/config_schema_SUITE_data/schema/rabbitmq.schema b/test/config_schema_SUITE_data/schema/rabbitmq.schema
index bf9cccbcb8..f6b18de72f 100644
--- a/test/config_schema_SUITE_data/schema/rabbitmq.schema
+++ b/test/config_schema_SUITE_data/schema/rabbitmq.schema
@@ -764,20 +764,28 @@ end}.
 %%
 %% {cluster_nodes, {['rabbit@my.host.com'], disc}},
 
-{mapping, "cluster_nodes.disc.$node", "rabbit.cluster_nodes",
+{mapping, "autocluster.classic_config.nodes.$node", "rabbit.cluster_nodes",
     [{datatype, atom}]}.
 
-{mapping, "cluster_nodes.ram.$node", "rabbit.cluster_nodes",
+{mapping, "autocluster.classic_config.nodes.$node", "rabbit.cluster_nodes",
     [{datatype, atom}]}.
 
+{mapping, "autocluster.classic_config.node_type", "rabbit.cluster_nodes", [
+    {datatype, {enum, [disc, disk, ram]}},
+    {default,  disc}
+]}.
+
 {translation, "rabbit.cluster_nodes",
 fun(Conf) ->
-    DiskNodes = [ V || {_, V} <- cuttlefish_variable:filter_by_prefix("cluster_nodes.disc", Conf)],
-    RamNodes  = [ V || {_, V} <- cuttlefish_variable:filter_by_prefix("cluster_nodes.ram", Conf)],
-
-    case {DiskNodes, RamNodes} of
-        {_,  []} -> {DiskNodes, disc};
-        {[],  _} -> {RamNodes, ram}
+    Nodes = [V || {_, V} <- cuttlefish_variable:filter_by_prefix("autocluster.classic_config.nodes", Conf)],
+
+    case Nodes of
+        []    -> cuttlefish:unset();
+        Other ->
+            case cuttlefish:conf_get("autocluster.classic_config.node_type", Conf, disc) of
+                disc -> {Other, disc};
+                ram  -> {Other, ram}
+            end
     end
 end}.
 
diff --git a/test/config_schema_SUITE_data/snippets.config b/test/config_schema_SUITE_data/snippets.config
index abfc28441e..45d9d73936 100644
--- a/test/config_schema_SUITE_data/snippets.config
+++ b/test/config_schema_SUITE_data/snippets.config
@@ -94,8 +94,9 @@ default_permissions.write = .*",
 {default_permissions, [<<".*">>, <<".*">>, <<".*">>]}]}],[]}
 ,
 {13,
-"cluster_nodes.disc.1 = rabbit@hostname1
-cluster_nodes.disc.2 = rabbit@hostname2",
+"autocluster.classic_config.nodes.peer1 = rabbit@hostname1
+autocluster.classic_config.nodes.peer2 = rabbit@hostname2
+autocluster.classic_config.node_type = disc",
 [{rabbit, [
     {cluster_nodes, {[rabbit@hostname2,rabbit@hostname1], disc}}
 ]}],[]}