High: Admin: All tools now use --node (-N) for specifying node unames

Mercurial revision: 1a2b853222a2a5ba71d8e6ef682a0106491f99e1

Author: beekhof

crm/admin/cibadmin.c

@@ -87,7 +87,7 @@ int operation_status = 0;
 cib_t *the_cib = NULL;
 
 gboolean force_flag = FALSE;
-#define OPTARGS	"V?o:QDUCEX:t:Srwlsh:MmBfbRx:pP5"
+#define OPTARGS	"V?o:QDUCEX:t:Srwlsh:MmBfbRx:pP5N:"
 
 
 int
@@ -128,7 +128,8 @@ main(int argc, char **argv)
 		{"local",	0, 0, 'l'},
 		{"sync-call",	0, 0, 's'},
 		{"no-bcast",	0, 0, 'b'},
-		{"host",	0, 0, 'h'},
+		{"host",	0, 0, 'h'}, /* legacy */
+		{"node",	0, 0, 'N'},
 		{F_CRM_DATA,    1, 0, 'X'},
 		{"xml-file",    1, 0, 'x'},
 		{"xml-pipe",    0, 0, 'p'},

crm/admin/crm_attribute.c

@@ -62,7 +62,7 @@ const char *rsc_id     = NULL;
 const char *dest_uname = NULL;
 const char *attr_value = NULL;
 
-#define OPTARGS	"V?GDQU:u:s:n:v:l:t:i:!r:"
+#define OPTARGS	"V?GDQN:U:u:s:n:v:l:t:i:!r:"
 
 int
 main(int argc, char **argv)
@@ -84,8 +84,9 @@ main(int argc, char **argv)
 		{"quiet",       0, 0, 'Q'},
 		{"get-value",   0, 0, 'G'},
 		{"delete-attr", 0, 0, 'D'},
-		{"node-uname",  1, 0, 'U'},
-		{"node-uuid",   1, 0, 'u'},
+		{"node",        1, 0, 'N'},
+		{"node-uname",  1, 0, 'U'}, /* legacy */
+		{"node-uuid",   1, 0, 'u'}, /* legacy */
 		{"set-name",    1, 0, 's'},
 		{"attr-id",     1, 0, 'i'},
 		{"attr-name",   1, 0, 'n'},
@@ -133,6 +134,7 @@ main(int argc, char **argv)
 				DO_DELETE = TRUE;
 				break;
 			case 'U':
+			case 'N':
 				crm_debug_2("Option %c => %s", flag, optarg);
 				dest_uname = optarg;
 				break;
@@ -447,21 +449,17 @@ usage(const char *cmd, int exit_status)
 			"lifetime", 'l');
 		exit(exit_status);
 	} else if(safe_str_eq(cmd, "crm_standby")) {
-		fprintf(stream, "\t--%s (-%c) <node_uuid>\t: "
-			"UUID of the node to change\n", "node-uuid", 'u');
 		fprintf(stream, "\t--%s (-%c) <node_uname>\t: "
-			"uname of the node to change\n", "node-uname", 'U');
+			"uname of the node to change\n", "node", 'N');
 		fprintf(stream, "\t--%s (-%c) <string>\t: "
 			"How long the preference lasts (reboot|forever)\n"
 			"\t    If a forever value exists, it is ALWAYS used by the CRM\n"
 			"\t    instead of any reboot value\n", "lifetime", 'l');
 		exit(exit_status);
 	}
 
-	fprintf(stream, "\t--%s (-%c) <node_uuid>\t: "
-		"UUID of the node to change\n", "node-uuid", 'u');
 	fprintf(stream, "\t--%s (-%c) <node_uname>\t: "
-		"uname of the node to change\n", "node-uname", 'U');
+		"uname of the node to change\n", "node-uname", 'h');
 
 	if(safe_str_eq(cmd, "crm_failcount")) {
 		fprintf(stream, "\t--%s (-%c) <resource name>\t: "
@@ -476,9 +474,9 @@ usage(const char *cmd, int exit_status)
 			"Which section of the CIB to set the attribute: (%s|%s|%s)\n",
 			"type", 't',
 			XML_CIB_TAG_NODES, XML_CIB_TAG_STATUS, XML_CIB_TAG_CRMCONFIG);
-		fprintf(stream, "\t    -t=%s options: -(U|u) -n [-s]\n", XML_CIB_TAG_NODES);
-		fprintf(stream, "\t    -t=%s options: -(U|u) -n [-s]\n", XML_CIB_TAG_STATUS);
-		fprintf(stream, "\t    -t=%s options: -n [-s]\n", XML_CIB_TAG_CRMCONFIG);
+		fprintf(stream, "\t    -t=%s options: -N -n [-s]\n", XML_CIB_TAG_NODES);
+		fprintf(stream, "\t    -t=%s options: -N -n [-s]\n", XML_CIB_TAG_STATUS);
+		fprintf(stream, "\t    -t=%s options: -N [-s]\n", XML_CIB_TAG_CRMCONFIG);
 	}
 
 	if(safe_str_neq(crm_system_name, "crm_standby")) {

crm/admin/crm_resource.c

@@ -67,7 +67,7 @@ IPC_Channel *crmd_channel = NULL;
 char *xml_file = NULL;
 int cib_options = cib_sync_call;
 
-#define OPTARGS	"V?LRQxDCPp:WMUr:H:v:t:p:g:d:i:s:G:S:fX:lmu:FOoc"
+#define OPTARGS	"V?LRQxDCPp:WMUr:H:h:v:t:p:g:d:i:s:G:S:fX:lmu:FOoc"
 #define CMD_ERR(fmt, args...) do {		\
 	crm_warn(fmt, ##args);			\
 	fprintf(stderr, fmt, ##args);		\
@@ -881,7 +881,8 @@ main(int argc, char **argv)
 		{"migrate",    0, 0, 'M'},
 		{"un-migrate", 0, 0, 'U'},
 		{"resource",   1, 0, 'r'},
-		{"host-uname", 1, 0, 'H'},
+		{"host-uname", 1, 0, 'H'}, /* legacy */
+		{"node",       1, 0, 'N'},
 		{"lifetime",   1, 0, 'u'},
 		{"fail",       0, 0, 'F'},
 		{"force",      0, 0, 'f'},
@@ -1018,6 +1019,7 @@ main(int argc, char **argv)
 				rsc_type = optarg;
 				break;
 
+			case 'h':
 			case 'H':
 				crm_debug_2("Option %c => %s", flag, optarg);
 				host_uname = optarg;
@@ -1432,7 +1434,7 @@ usage(const char *cmd, int exit_status)
 		"\t\t\t  Optional: -H, -r\n", "list-operations", 'O');
 	fprintf(stream, "\t--%s (-%c) <string>: "
 		"List all resource operations.  Optionally filtered by resource and/or node.\n"
-		"\t\t\t  Optional: -H, -r\n", "list-all-operations", 'o');
+		"\t\t\t  Optional: -N, -r\n", "list-all-operations", 'o');
 	fprintf(stream, "\nOptions\n");
 	fprintf(stream, "\t--%s (-%c) <string>\t: Resource ID\n", "resource", 'r');
 	fprintf(stream, "\t--%s (-%c) <string>\t: "
@@ -1441,8 +1443,7 @@ usage(const char *cmd, int exit_status)
 
 	fprintf(stream, "\t--%s (-%c) <string>\t: "
 		"Property value\n", "property-value", 'v');
-	fprintf(stream, "\t--%s (-%c) <string>\t: "
-		"Host name\n", "host-uname", 'H');
+	fprintf(stream, "\t--%s (-%c) <string>\t: Host uname\n", "node", 'N');
 	fprintf(stream, "\t--%s\t: Modify a resource's configuration option rather than one which is passed to the resource agent script."
 		"\n\t\tFor use with -p, -g, -d\n", "meta");
 	fprintf(stream, "\t--%s (-%c) <string>\t: "

tools/pingd.c

@@ -75,7 +75,7 @@ void do_node_walk(ll_cluster_t *hb_cluster);
 #endif
 
 /* GMainLoop *mainloop = NULL; */
-#define OPTARGS	"V?p:a:d:s:S:h:Dm:"
+#define OPTARGS	"V?p:a:d:s:S:h:Dm:N:"
 
 GListPtr ping_list = NULL;
 IPC_Channel *attrd = NULL;
@@ -501,7 +501,7 @@ usage(const char *cmd, int exit_status)
 		"\t\t\t\t\t* Default=cib-bootstrap-options\n", "attr-set", 's');
 	fprintf(stream, "\t--%s (-%c) <string>\tWhich part of the CIB to put the attribute in\n"
 		"\t\t\t\t\t* Default=status\n", "attr-section", 'S');
-	fprintf(stream, "\t--%s (-%c) <single_host_name>\tMonitor a subset of the ping nodes listed in ha.cf (can be specified multiple times)\n", "ping-host", 'h');
+	fprintf(stream, "\t--%s (-%c) <single_host_name>\tMonitor a subset of the ping nodes listed in ha.cf (can be specified multiple times)\n", "node", 'N');
 	fprintf(stream, "\t--%s (-%c) <integer>\t\tHow long to wait for no further changes to occur before updating the CIB with a changed attribute\n", "attr-dampen", 'd');
 	fprintf(stream, "\t--%s (-%c) <integer>\tFor every connected node, add <integer> to the value set in the CIB\n"
 		"\t\t\t\t\t\t* Default=1\n", "value-multiplier", 'm');
@@ -705,10 +705,11 @@ main(int argc, char **argv)
 	int option_index = 0;
 	static struct option long_options[] = {
 		/* Top-level Options */
-		{"verbose", 0, 0, 'V'},
-		{"help", 0, 0, '?'},
+		{"verbose",   0, 0, 'V'},
+		{"help",      0, 0, '?'},
 		{"pid-file",  1, 0, 'p'},		
-		{"ping-host", 1, 0, 'h'},		
+		{"node",      1, 0, 'N'},		
+		{"ping-host", 1, 0, 'h'}, /* legacy */
 		{"attr-name", 1, 0, 'a'},		
 		{"attr-set",  1, 0, 's'},		
 		{"daemonize", 0, 0, 'D'},		
@@ -751,6 +752,7 @@ main(int argc, char **argv)
 			case 'a':
 				pingd_attr = crm_strdup(optarg);
 				break;
+			case 'N':
 			case 'h':
 				stand_alone = TRUE;
 				crm_debug("Adding ping host %s", optarg);