Skip to content

Commit f9d25b6

Browse files
committed
API: fencer: Deprecate metadata CLI option
Use pcmk_list_fence_attrs() or crm_resource --list-options=fencing instead. (Also fix a few other deprecation comments.) Ref T620 Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
1 parent da0dcb1 commit f9d25b6

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

daemons/based/pacemaker-based.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ setup_stand_alone(GError **error)
125125
return pcmk_rc_ok;
126126
}
127127

128-
/* @COMPAT Deprecated since 2.1.8; use pcmk_cluster_list_options() or
129-
* crm_attribute --list-options instead of querying daemon metadata.
128+
/* @COMPAT Deprecated since 2.1.8. Use pcmk_list_cluster_options() or
129+
* crm_attribute --list-options=cluster instead of querying daemon metadata.
130130
*/
131131
static int
132132
based_metadata(pcmk__output_t *out)

daemons/controld/pacemaker-controld.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ static pcmk__supported_format_t formats[] = {
4646
{ NULL, NULL, NULL }
4747
};
4848

49-
/* @COMPAT Deprecated since 2.1.8; use pcmk_cluster_list_options() or
50-
* crm_attribute --list-options instead of querying daemon metadata.
49+
/* @COMPAT Deprecated since 2.1.8. Use pcmk_list_cluster_options() or
50+
* crm_attribute --list-options=cluster instead of querying daemon metadata.
5151
*/
5252
static int
5353
controld_metadata(pcmk__output_t *out)

daemons/fenced/pacemaker-fenced.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,9 @@ st_peer_update_callback(enum crm_status_type type, crm_node_t * node, const void
488488
}
489489
}
490490

491+
/* @COMPAT Deprecated since 2.1.8. Use pcmk_list_fence_attrs() or
492+
* crm_resource --list-options=fencing instead of querying daemon metadata.
493+
*/
491494
static int
492495
fencer_metadata(void)
493496
{
@@ -521,8 +524,7 @@ build_arg_context(pcmk__common_args_t *args, GOptionGroup **group)
521524
{
522525
GOptionContext *context = NULL;
523526

524-
context = pcmk__build_arg_context(args, "text (default), xml", group,
525-
"[metadata]");
527+
context = pcmk__build_arg_context(args, "text (default), xml", group, NULL);
526528
pcmk__add_main_args(context, entries);
527529
return context;
528530
}

daemons/schedulerd/pacemaker-schedulerd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ pcmk__supported_format_t formats[] = {
4646

4747
void pengine_shutdown(int nsig);
4848

49-
/* @COMPAT Deprecated since 2.1.8; use pcmk_cluster_list_options() or
50-
* crm_attribute --list-options instead of querying daemon metadata.
49+
/* @COMPAT Deprecated since 2.1.8. Use pcmk_list_cluster_options() or
50+
* crm_attribute --list-options=cluster instead of querying daemon metadata.
5151
*/
5252
static int
5353
scheduler_metadata(pcmk__output_t *out)

0 commit comments

Comments
 (0)