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>
ClusterLabs · Apr 8, 2024 · 1d4afa6 · 1d4afa6
1 parent 3a3fb6b
commit 1d4afa6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/daemons/based/pacemaker-based.c b/daemons/based/pacemaker-based.c
@@ -125,8 +125,8 @@ setup_stand_alone(GError **error)
     return pcmk_rc_ok;
 }
 
-/* @COMPAT Deprecated since 2.1.8; use pcmk_cluster_list_options() or
- * crm_attribute --list-options instead of querying daemon metadata.
+/* @COMPAT Deprecated since 2.1.8. Use pcmk_list_cluster_options() or
+ * crm_attribute --list-options=cluster instead of querying daemon metadata.
  */
 static int
 based_metadata(pcmk__output_t *out)

diff --git a/daemons/controld/pacemaker-controld.c b/daemons/controld/pacemaker-controld.c
@@ -46,8 +46,8 @@ static pcmk__supported_format_t formats[] = {
     { NULL, NULL, NULL }
 };
 
-/* @COMPAT Deprecated since 2.1.8; use pcmk_cluster_list_options() or
- * crm_attribute --list-options instead of querying daemon metadata.
+/* @COMPAT Deprecated since 2.1.8. Use pcmk_list_cluster_options() or
+ * crm_attribute --list-options=cluster instead of querying daemon metadata.
  */
 static int
 controld_metadata(pcmk__output_t *out)

diff --git a/daemons/fenced/pacemaker-fenced.c b/daemons/fenced/pacemaker-fenced.c
@@ -486,6 +486,9 @@ st_peer_update_callback(enum crm_status_type type, crm_node_t * node, const void
     }
 }
 
+/* @COMPAT Deprecated since 2.1.8. Use pcmk_list_fence_attrs() or
+ * crm_resource --list-options=fencing instead of querying daemon metadata.
+ */
 static int
 fencer_metadata(void)
 {
@@ -519,8 +522,7 @@ build_arg_context(pcmk__common_args_t *args, GOptionGroup **group)
 {
     GOptionContext *context = NULL;
 
-    context = pcmk__build_arg_context(args, "text (default), xml", group,
-                                      "[metadata]");
+    context = pcmk__build_arg_context(args, "text (default), xml", group, NULL);
     pcmk__add_main_args(context, entries);
     return context;
 }

diff --git a/daemons/schedulerd/pacemaker-schedulerd.c b/daemons/schedulerd/pacemaker-schedulerd.c
@@ -46,8 +46,8 @@ pcmk__supported_format_t formats[] = {
 
 void pengine_shutdown(int nsig);
 
-/* @COMPAT Deprecated since 2.1.8; use pcmk_cluster_list_options() or
- * crm_attribute --list-options instead of querying daemon metadata.
+/* @COMPAT Deprecated since 2.1.8. Use pcmk_list_cluster_options() or
+ * crm_attribute --list-options=cluster instead of querying daemon metadata.
  */
 static int
 scheduler_metadata(pcmk__output_t *out)