@@ -1011,19 +1011,41 @@ configured_metadata_store(Config) ->
10111011
10121012configure_metadata_store (Config ) ->
10131013 ct :log (" Configuring metadata store..." ),
1014+ Value = rabbit_ct_helpers :get_app_env (
1015+ Config , rabbit , forced_feature_flags_on_init , undefined ),
10141016 case configured_metadata_store (Config ) of
10151017 khepri ->
10161018 ct :log (" Enabling Khepri metadata store" ),
1017- rabbit_ct_helpers :merge_app_env (
1018- Config ,
1019- {rabbit ,
1020- [{forced_feature_flags_on_init , {rel , [khepri_db ], []}}]});
1019+ case Value of
1020+ undefined ->
1021+ rabbit_ct_helpers :merge_app_env (
1022+ Config ,
1023+ {rabbit ,
1024+ [{forced_feature_flags_on_init ,
1025+ {rel , [khepri_db ], []}}]});
1026+ _ ->
1027+ rabbit_ct_helpers :merge_app_env (
1028+ Config ,
1029+ {rabbit ,
1030+ [{forced_feature_flags_on_init ,
1031+ [khepri_db | Value ]}]})
1032+ end ;
10211033 mnesia ->
10221034 ct :log (" Enabling Mnesia metadata store" ),
1023- rabbit_ct_helpers :merge_app_env (
1024- Config ,
1025- {rabbit ,
1026- [{forced_feature_flags_on_init , {rel , [], [khepri_db ]}}]})
1035+ case Value of
1036+ undefined ->
1037+ rabbit_ct_helpers :merge_app_env (
1038+ Config ,
1039+ {rabbit ,
1040+ [{forced_feature_flags_on_init ,
1041+ {rel , [], [khepri_db ]}}]});
1042+ _ ->
1043+ rabbit_ct_helpers :merge_app_env (
1044+ Config ,
1045+ {rabbit ,
1046+ [{forced_feature_flags_on_init ,
1047+ Value -- [khepri_db ]}]})
1048+ end
10271049 end .
10281050
10291051% % Waits until the metadata store replica on Node is up to date with the leader.
0 commit comments