Merge pull request #11654 from rabbitmq/rabbitmq-server-11653

Take `-setcookie` argument into account for peer args
rabbitmq · Jul 10, 2024 · 6985886 · 6985886
2 parents 50116f0 + c3c4612
commit 6985886
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/deps/rabbit/src/rabbit_peer_discovery.erl b/deps/rabbit/src/rabbit_peer_discovery.erl
@@ -409,7 +409,12 @@ query_node_props(Nodes) when Nodes =/= [] ->
                     var_origins := #{erlang_cookie := environment}} ->
                       ["-setcookie", atom_to_list(ErlangCookie) | VMArgs1];
                   _ ->
-                      VMArgs1
+                      case init:get_argument(setcookie) of
+                          {ok, [[SetCookieArg]]} ->
+                              ["-setcookie", SetCookieArg | VMArgs1];
+                          _ ->
+                              VMArgs1
+                      end
               end,
     VMArgs3 = maybe_add_proto_dist_arguments(VMArgs2),
     VMArgs4 = maybe_add_inetrc_arguments(VMArgs3),