|
193 | 193 | tcp_port_mqtt_tls, |
194 | 194 | tcp_port_web_mqtt, |
195 | 195 | tcp_port_web_mqtt_tls, |
196 | | - tcp_port_web_mqtt_examples, |
197 | 196 | tcp_port_stomp, |
198 | 197 | tcp_port_stomp_tls, |
199 | 198 | tcp_port_web_stomp, |
200 | 199 | tcp_port_web_stomp_tls, |
201 | | - tcp_port_web_stomp_examples, |
202 | 200 | tcp_port_stream, |
203 | 201 | tcp_port_stream_tls, |
204 | 202 | tcp_port_prometheus |
@@ -537,18 +535,10 @@ update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_mqtt = Key | Rest]) -> |
537 | 535 | NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig, |
538 | 536 | {rabbitmq_web_mqtt, [{tcp_config, [{port, ?config(Key, NodeConfig)}]}]}), |
539 | 537 | update_tcp_ports_in_rmq_config(NodeConfig1, Rest); |
540 | | -update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_mqtt_examples = Key | Rest]) -> |
541 | | - NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig, |
542 | | - {rabbitmq_web_mqtt_examples, [{listener, [{port, ?config(Key, NodeConfig)}]}]}), |
543 | | - update_tcp_ports_in_rmq_config(NodeConfig1, Rest); |
544 | 538 | update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_stomp = Key | Rest]) -> |
545 | 539 | NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig, |
546 | 540 | {rabbitmq_web_stomp, [{tcp_config, [{port, ?config(Key, NodeConfig)}]}]}), |
547 | 541 | update_tcp_ports_in_rmq_config(NodeConfig1, Rest); |
548 | | -update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_stomp_examples = Key | Rest]) -> |
549 | | - NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig, |
550 | | - {rabbitmq_web_stomp_examples, [{listener, [{port, ?config(Key, NodeConfig)}]}]}), |
551 | | - update_tcp_ports_in_rmq_config(NodeConfig1, Rest); |
552 | 542 | update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_stomp_tls | Rest]) -> |
553 | 543 | %% Skip this one, because we need more than just a port to configure |
554 | 544 | update_tcp_ports_in_rmq_config(NodeConfig, Rest); |
@@ -779,16 +769,17 @@ do_start_rabbitmq_node(Config, NodeConfig, I) -> |
779 | 769 | case UseSecondaryDist of |
780 | 770 | true -> |
781 | 771 | SecondaryDist = ?config(secondary_dist, Config), |
782 | | -% SecondaryEnabledPlugin = case filename:basename(SrcDir) of |
783 | | -% "rabbit" -> ""; |
784 | | -% SrcPlugin -> SrcPlugin |
785 | | -% end, |
| 772 | + SecondaryEnabledPlugins = case {?config(secondary_enabled_plugins, Config), filename:basename(SrcDir)} of |
| 773 | + {undefined, "rabbit"} -> ""; |
| 774 | + {undefined, SrcPlugin} -> SrcPlugin; |
| 775 | + {SecondaryEnabledPlugins0, _} -> SecondaryEnabledPlugins0 |
| 776 | + end, |
786 | 777 | [{"DIST_DIR=~ts/plugins", [SecondaryDist]}, |
787 | 778 | {"CLI_SCRIPTS_DIR=~ts/sbin", [SecondaryDist]}, |
788 | 779 | {"CLI_ESCRIPTS_DIR=~ts/escript", [SecondaryDist]}, |
789 | 780 | {"RABBITMQ_SCRIPTS_DIR=~ts/sbin", [SecondaryDist]}, |
790 | 781 | {"RABBITMQ_SERVER=~ts/sbin/rabbitmq-server", [SecondaryDist]}, |
791 | | -% {"RABBITMQ_ENABLED_PLUGINS=~ts", [SecondaryEnabledPlugin]}, |
| 782 | + {"RABBITMQ_ENABLED_PLUGINS=~ts", [SecondaryEnabledPlugins]}, |
792 | 783 | {"RABBITMQ_FEATURE_FLAGS=~ts", [?REQUIRED_FEATURE_FLAGS]} |
793 | 784 | | ExtraArgs4]; |
794 | 785 | false -> |
|
0 commit comments