Skip to content

Commit

Permalink
Build: configure: deprecate --with-concurrent-fencing-default and def…
Browse files Browse the repository at this point in the history
…ault it to true
  • Loading branch information
kgaillot committed Sep 4, 2024
1 parent cca9188 commit 8f235ef
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
11 changes: 6 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -319,13 +319,14 @@ AC_ARG_WITH([gnutls-priorities],
)

AC_ARG_WITH([concurrent-fencing-default],
[AS_HELP_STRING([--with-concurrent-fencing-default],
[default value for concurrent-fencing cluster option @<:@false@:>@])],
[AS_HELP_STRING([--with-concurrent-fencing-default], m4_normalize([
default value for concurrent-fencing cluster option (deprecated)
@<:@true@:>@]))],
)
AS_CASE([$with_concurrent_fencing_default],
[""], [with_concurrent_fencing_default="false"],
[false], [],
[true], [PCMK_FEATURES="$PCMK_FEATURES default-concurrent-fencing"],
[""], [with_concurrent_fencing_default="true"],
[true], [],
[false], [PCMK_FEATURES="$PCMK_FEATURES concurrent-fencing-default-false"],
[AC_MSG_ERROR([Invalid value "$with_concurrent_fencing_default" for --with-concurrent-fencing-default])]
)

Expand Down
8 changes: 3 additions & 5 deletions lib/common/options.c
Original file line number Diff line number Diff line change
Expand Up @@ -630,11 +630,9 @@ static const pcmk__cluster_option_t fencing_params[] = {
pcmk__opt_none,
N_("The maximum number of actions can be performed in parallel on this "
"device"),
N_("Cluster property concurrent-fencing=\"true\" needs to be "
"configured first. Then use this to specify the maximum number of "
"actions can be performed in parallel on this device. A value of "
"-1 means an unlimited number of actions can be performed in "
"parallel."),
N_("If the concurrent-fencing cluster property is \"true\", this "
"specifies the maximum number of actions that can be performed in "
"parallel on this device. A value of -1 means unlimited."),
},
{
"pcmk_reboot_action", NULL, PCMK_VALUE_STRING, NULL,
Expand Down

0 comments on commit 8f235ef

Please sign in to comment.