diff --git a/cts/cli/regression.crm_mon.exp b/cts/cli/regression.crm_mon.exp index 6f0df33..43c1d9a 100644 --- a/cts/cli/regression.crm_mon.exp +++ b/cts/cli/regression.crm_mon.exp @@ -480,13 +480,13 @@ Node List: * Online: [ cluster01 cluster02 ] Active Resources: - * 1 (ocf::pacemaker:Dummy): Active cluster02 - * 1 (stonith:fence_xvm): Active cluster01 + * 1 (ocf::pacemaker:Dummy): Active cluster02 + * 1 (stonith:fence_xvm): Active cluster01 * Clone Set: ping-clone [ping]: * Started: [ cluster01 cluster02 ] * Resource Group: exim-group: - * 1/1 (lsb:exim): Active cluster02 - * 1/1 (ocf::heartbeat:IPaddr): Active cluster02 + * 1/1 (lsb:exim): Active cluster02 + * 1/1 (ocf::heartbeat:IPaddr): Active cluster02 * Clone Set: mysql-clone-group [mysql-group]: * Started: [ cluster01 cluster02 ] @@ -609,16 +609,16 @@ Cluster Summary: Node List: * Node cluster01: online: * Resources: - * 1 (lsb:mysql-proxy): Active - * 1 (ocf::pacemaker:ping): Active - * 1 (stonith:fence_xvm): Active + * 1 (lsb:mysql-proxy): Active + * 1 (ocf::pacemaker:ping): Active + * 1 (stonith:fence_xvm): Active * Node cluster02: online: * Resources: - * 1 (lsb:exim): Active - * 1 (lsb:mysql-proxy): Active - * 1 (ocf::heartbeat:IPaddr): Active - * 1 (ocf::pacemaker:Dummy): Active - * 1 (ocf::pacemaker:ping): Active + * 1 (lsb:exim): Active + * 1 (lsb:mysql-proxy): Active + * 1 (ocf::heartbeat:IPaddr): Active + * 1 (ocf::pacemaker:Dummy): Active + * 1 (ocf::pacemaker:ping): Active Node Attributes: * Node: cluster01: @@ -2857,7 +2857,7 @@ Node List: * GuestOnline: [ httpd-bundle-0@cluster02 httpd-bundle-1@cluster01 ] Full List of Resources: - * 1/1 (stonith:fence_xvm): Active cluster01 + * 1/1 (stonith:fence_xvm): Active cluster01 * Clone Set: ping-clone [ping]: * Started: [ cluster01 ] * Stopped: [ cluster02 ] @@ -2865,7 +2865,7 @@ Full List of Resources: * httpd-bundle-0 (192.168.122.131) (ocf::heartbeat:apache): Started cluster02 * httpd-bundle-1 (192.168.122.132) (ocf::heartbeat:apache): Stopped cluster01 * Resource Group: partially-active-group: - * 1/2 (ocf::pacemaker:Dummy): Active cluster02 + * 1/2 (ocf::pacemaker:Dummy): Active cluster02 Node Attributes: * Node: cluster01: @@ -2919,20 +2919,20 @@ Cluster Summary: Node List: * Node cluster01: online: * Resources: - * 1 (ocf::heartbeat:IPaddr2): Active - * 1 (ocf::heartbeat:docker): Active - * 1 (ocf::pacemaker:ping): Active - * 1 (ocf::pacemaker:remote): Active - * 1 (stonith:fence_xvm): Active + * 1 (ocf::heartbeat:IPaddr2): Active + * 1 (ocf::heartbeat:docker): Active + * 1 (ocf::pacemaker:ping): Active + * 1 (ocf::pacemaker:remote): Active + * 1 (stonith:fence_xvm): Active * Node cluster02: online: * Resources: - * 1 (ocf::heartbeat:IPaddr2): Active - * 1 (ocf::heartbeat:docker): Active - * 1 (ocf::pacemaker:Dummy): Active - * 1 (ocf::pacemaker:remote): Active + * 1 (ocf::heartbeat:IPaddr2): Active + * 1 (ocf::heartbeat:docker): Active + * 1 (ocf::pacemaker:Dummy): Active + * 1 (ocf::pacemaker:remote): Active * GuestNode httpd-bundle-0@cluster02: online: * Resources: - * 1 (ocf::heartbeat:apache): Active + * 1 (ocf::heartbeat:apache): Active Inactive Resources: * Clone Set: ping-clone [ping]: @@ -2942,7 +2942,7 @@ Inactive Resources: * httpd-bundle-0 (192.168.122.131) (ocf::heartbeat:apache): Started cluster02 * httpd-bundle-1 (192.168.122.132) (ocf::heartbeat:apache): Stopped cluster01 * Resource Group: partially-active-group: - * 1/2 (ocf::pacemaker:Dummy): Active cluster02 + * 1/2 (ocf::pacemaker:Dummy): Active cluster02 Node Attributes: * Node: cluster01: diff --git a/lib/pengine/clone.c b/lib/pengine/clone.c index 9b48d01..9e98178 100644 --- a/lib/pengine/clone.c +++ b/lib/pengine/clone.c @@ -781,7 +781,7 @@ pe__clone_html(pcmk__output_t *out, va_list args) } if (list_text != NULL) { - out->list_item(out, NULL, " Masters: [ %s ]", list_text); + out->list_item(out, NULL, "Masters: [ %s ]", list_text); g_list_free(master_list); free(list_text); list_text = NULL; @@ -806,13 +806,13 @@ pe__clone_html(pcmk__output_t *out, va_list args) enum rsc_role_e role = configured_role(rsc); if(role == RSC_ROLE_SLAVE) { - out->list_item(out, NULL, " Slaves (target-role): [ %s ]", list_text); + out->list_item(out, NULL, "Slaves (target-role): [ %s ]", list_text); } else { - out->list_item(out, NULL, " Slaves: [ %s ]", list_text); + out->list_item(out, NULL, "Slaves: [ %s ]", list_text); } } else { - out->list_item(out, NULL, " Started: [ %s ]", list_text); + out->list_item(out, NULL, "Started: [ %s ]", list_text); } g_list_free(started_list); @@ -861,7 +861,7 @@ pe__clone_html(pcmk__output_t *out, va_list args) } if (stopped_list != NULL) { - out->list_item(out, NULL, " %s: [ %s ]", state, stopped_list); + out->list_item(out, NULL, "%s: [ %s ]", state, stopped_list); free(stopped_list); stopped_list_len = 0; } diff --git a/lib/pengine/native.c b/lib/pengine/native.c index 68fe12d..3e15d8c 100644 --- a/lib/pengine/native.c +++ b/lib/pengine/native.c @@ -1456,12 +1456,12 @@ pe__rscs_brief_output(pcmk__output_t *out, GListPtr rsc_list, long options, gboo } if (print_all) { - out->list_item(out, NULL, " %d/%d\t(%s):\tActive %s", + out->list_item(out, NULL, "%d/%d\t(%s):\tActive %s", *active_counter, rsc_counter ? *rsc_counter : 0, type, (*active_counter > 0) && node_name ? node_name : ""); } else { - out->list_item(out, NULL, " %d\t(%s):\tActive %s", + out->list_item(out, NULL, "%d\t(%s):\tActive %s", *active_counter, type, (*active_counter > 0) && node_name ? node_name : ""); } @@ -1470,7 +1470,7 @@ pe__rscs_brief_output(pcmk__output_t *out, GListPtr rsc_list, long options, gboo } if (print_all && active_counter_all == 0) { - out->list_item(out, NULL, " %d/%d\t(%s):\tActive", + out->list_item(out, NULL, "%d/%d\t(%s):\tActive", active_counter_all, rsc_counter ? *rsc_counter : 0, type); rc = pcmk_rc_ok; diff --git a/lib/pengine/pe_output.c b/lib/pengine/pe_output.c index a7118a4..e26604e 100644 --- a/lib/pengine/pe_output.c +++ b/lib/pengine/pe_output.c @@ -1890,13 +1890,13 @@ pe__ticket_text(pcmk__output_t *out, va_list args) { if (ticket->last_granted > -1) { char *time = pcmk_format_named_time("last-granted", ticket->last_granted); - out->list_item(out, ticket->id, "\t%s%s %s", + out->list_item(out, ticket->id, "%s%s %s", ticket->granted ? "granted" : "revoked", ticket->standby ? " [standby]" : "", time); free(time); } else { - out->list_item(out, ticket->id, "\t%s%s", + out->list_item(out, ticket->id, "%s%s", ticket->granted ? "granted" : "revoked", ticket->standby ? " [standby]" : ""); }