cluster: STABLE3 - cman: use the typed objdb calls
by Christine Caulfield
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 6552110fd20295d0f5244b7e2f87735545d2110e
Parent: 2369ffed5d9f58c57a36d24712a05049fee9d1b3
Author: Christine Caulfield <ccaulfie(a)redhat.com>
AuthorDate: Thu Jan 14 11:09:04 2010 +0000
Committer: Christine Caulfield <ccaulfie(a)redhat.com>
CommitterDate: Thu Jan 14 11:09:04 2010 +0000
cman: use the typed objdb calls
Make cman add the type to all objdb key_create calls so that they
print out correctly when using corosync-objctl.
Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com>
---
cman/cman_tool/join.c | 17 +++-
cman/daemon/cman-preconfig.c | 189 ++++++++++++++++++-------------------
config/libs/libccsconfdb/libccs.c | 33 +++----
config/plugins/ldap/configldap.c | 5 +-
config/plugins/xml/config.c | 6 +-
5 files changed, 128 insertions(+), 122 deletions(-)
diff --git a/cman/cman_tool/join.c b/cman/cman_tool/join.c
index fa1920e..308d19b 100644
--- a/cman/cman_tool/join.c
+++ b/cman/cman_tool/join.c
@@ -348,21 +348,28 @@ int join(commandline_t *comline, char *main_envp[])
int envnum = 0;
const char *envvar = main_envp[envnum];
const char *equal;
+ char envname[PATH_MAX];
+
while (envvar) {
if (strncmp("COROSYNC_", envvar, 9) == 0) {
equal = strchr(envvar, '=');
if (equal) {
- res = confdb_key_create(confdb_handle, object_handle, envvar, equal-envvar,
- equal+1, strlen(equal+1));
+ strncpy(envname, envvar, PATH_MAX);
+ if (equal-envvar < PATH_MAX) {
+ envname[equal-envvar] = '\0';
+
+ res = confdb_key_create_typed(confdb_handle, object_handle, envname,
+ equal+1, strlen(equal+1),CONFDB_VALUETYPE_STRING);
+ }
}
}
envvar = main_envp[++envnum];
}
}
- res = confdb_key_create(confdb_handle, object_handle,
- "COROSYNC_DEFAULT_CONFIG_IFACE", strlen("COROSYNC_DEFAULT_CONFIG_IFACE"),
- config_modules, strlen(config_modules));
+ res = confdb_key_create_typed(confdb_handle, object_handle,
+ "COROSYNC_DEFAULT_CONFIG_IFACE",
+ config_modules, strlen(config_modules), CONFDB_VALUETYPE_STRING);
confdb_finalize (confdb_handle);
join_exit:
diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index cf68836..00a5330 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -256,27 +256,27 @@ static int add_ifaddr(struct objdb_iface_ver0 *objdb, char *mcast, char *ifaddr,
void *addrptr;
sprintf(tmp, "%d", num_interfaces);
- objdb->object_key_create(interface_object_handle, "ringnumber", strlen("ringnumber"),
- tmp, strlen(tmp)+1);
+ objdb->object_key_create_typed(interface_object_handle, "ringnumber",
+ tmp, strlen(tmp)+1, OBJDB_VALUETYPE_STRING);
if (if_addr.ss_family == AF_INET)
addrptr = &in->sin_addr;
else
addrptr = &in6->sin6_addr;
inet_ntop(if_addr.ss_family, addrptr, tmp, sizeof(tmp));
- objdb->object_key_create(interface_object_handle, "bindnetaddr", strlen("bindnetaddr"),
- tmp, strlen(tmp)+1);
+ objdb->object_key_create_typed(interface_object_handle, "bindnetaddr",
+ tmp, strlen(tmp)+1, OBJDB_VALUETYPE_STRING);
if (broadcast)
- objdb->object_key_create(interface_object_handle, "broadcast", strlen("broadcast"),
- "yes", strlen("yes")+1);
+ objdb->object_key_create_typed(interface_object_handle, "broadcast",
+ "yes", strlen("yes")+1, OBJDB_VALUETYPE_STRING);
else
- objdb->object_key_create(interface_object_handle, "mcastaddr", strlen("mcastaddr"),
- mcast, strlen(mcast)+1);
+ objdb->object_key_create_typed(interface_object_handle, "mcastaddr",
+ mcast, strlen(mcast)+1, OBJDB_VALUETYPE_STRING);
sprintf(tmp, "%d", port);
- objdb->object_key_create(interface_object_handle, "mcastport", strlen("mcastport"),
- tmp, strlen(tmp)+1);
+ objdb->object_key_create_typed(interface_object_handle, "mcastport",
+ tmp, strlen(tmp)+1, OBJDB_VALUETYPE_STRING);
num_interfaces++;
}
@@ -601,8 +601,8 @@ static int get_nodename(struct objdb_iface_ver0 *objdb)
/* See if the user wants our default set of openais services (default=yes) */
objdb_get_int(objdb, object_handle, "disable_openais", &disable_openais, 0);
- objdb->object_key_create(object_handle, "nodename", strlen("nodename"),
- nodename, strlen(nodename)+1);
+ objdb->object_key_create_typed(object_handle, "nodename",
+ nodename, strlen(nodename)+1, OBJDB_VALUETYPE_STRING);
}
objdb->object_find_destroy(find_handle);
@@ -677,33 +677,32 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
{
char *value;
- objdb->object_key_create(object_handle, "version", strlen("version"),
- "2", 2);
+ objdb->object_key_create_typed(object_handle, "version",
+ "2", 2, OBJDB_VALUETYPE_STRING);
sprintf(tmp, "%d", nodeid);
- objdb->object_key_create(object_handle, "nodeid", strlen("nodeid"),
- tmp, strlen(tmp)+1);
+ objdb->object_key_create_typed(object_handle, "nodeid",
+ tmp, strlen(tmp)+1, OBJDB_VALUETYPE_STRING);
- objdb->object_key_create(object_handle, "vsftype", strlen("vsftype"),
- "none", strlen("none")+1);
+ objdb->object_key_create_typed(object_handle, "vsftype",
+ "none", strlen("none")+1, OBJDB_VALUETYPE_STRING);
/* Set the token timeout is 10 seconds, but don't overrride anything that
might be in cluster.conf */
if (objdb_get_string(objdb, object_handle, "token", &value)) {
snprintf(tmp, sizeof(tmp), "%d", DEFAULT_TOKEN_TIMEOUT);
- objdb->object_key_create(object_handle, "token", strlen("token"),
- tmp, strlen(tmp)+1);
+ objdb->object_key_create_typed(object_handle, "token",
+ tmp, strlen(tmp)+1, OBJDB_VALUETYPE_STRING);
}
if (objdb_get_string(objdb, object_handle, "token_retransmits_before_loss_const", &value)) {
- objdb->object_key_create(object_handle, "token_retransmits_before_loss_const",
- strlen("token_retransmits_before_loss_const"),
- "20", strlen("20")+1);
+ objdb->object_key_create_typed(object_handle, "token_retransmits_before_loss_const",
+ "20", strlen("20")+1, OBJDB_VALUETYPE_STRING);
}
/* Extend consensus & join timeouts per bz#214290 */
if (objdb_get_string(objdb, object_handle, "join", &value)) {
- objdb->object_key_create(object_handle, "join", strlen("join"),
- "60", strlen("60")+1);
+ objdb->object_key_create_typed(object_handle, "join",
+ "60", strlen("60")+1, OBJDB_VALUETYPE_STRING);
}
/* consensus should be 2*token, see bz#544482*/
if (objdb_get_string(objdb, object_handle, "consensus", &value)) {
@@ -712,26 +711,26 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
objdb_get_int(objdb, object_handle, "token", &token, DEFAULT_TOKEN_TIMEOUT);
sprintf(calc_consensus, "%d", token*2);
- objdb->object_key_create(object_handle, "consensus", strlen("consensus"),
- calc_consensus, strlen(calc_consensus)+1);
+ objdb->object_key_create_typed(object_handle, "consensus",
+ calc_consensus, strlen(calc_consensus)+1, OBJDB_VALUETYPE_STRING);
}
/* Set RRP mode appropriately */
if (objdb_get_string(objdb, object_handle, "rrp_mode", &value)) {
if (num_interfaces > 1) {
- objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),
- "active", strlen("active")+1);
+ objdb->object_key_create_typed(object_handle, "rrp_mode",
+ "active", strlen("active")+1, OBJDB_VALUETYPE_STRING);
}
else {
- objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),
- "none", strlen("none")+1);
+ objdb->object_key_create_typed(object_handle, "rrp_mode",
+ "none", strlen("none")+1, OBJDB_VALUETYPE_STRING);
}
}
if (objdb_get_string(objdb, object_handle, "secauth", &value)) {
sprintf(tmp, "%d", 1);
- objdb->object_key_create(object_handle, "secauth", strlen("secauth"),
- tmp, strlen(tmp)+1);
+ objdb->object_key_create_typed(object_handle, "secauth",
+ tmp, strlen(tmp)+1, OBJDB_VALUETYPE_STRING);
}
/* optional security key filename */
@@ -739,8 +738,8 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
objdb_get_string(objdb, object_handle, "keyfile", &key_filename);
}
else {
- objdb->object_key_create(object_handle, "keyfile", strlen("keyfile"),
- key_filename, strlen(key_filename)+1);
+ objdb->object_key_create_typed(object_handle, "keyfile",
+ key_filename, strlen(key_filename)+1, OBJDB_VALUETYPE_STRING);
}
if (!key_filename) {
/* Use the cluster name as key,
@@ -756,8 +755,8 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
/* Key length must be a multiple of 4 */
keylen = (strlen(cluster_name)+4) & 0xFC;
- objdb->object_key_create(object_handle, "key", strlen("key"),
- tmp, keylen);
+ objdb->object_key_create_typed(object_handle, "key",
+ tmp, keylen, OBJDB_VALUETYPE_STRING);
}
}
objdb->object_find_destroy(find_handle);
@@ -776,40 +775,40 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
/* enable timestamps on logging */
if (objdb_get_string(objdb, object_handle, "timestamp", &logstr)) {
- objdb->object_key_create(object_handle, "timestamp", strlen("timestamp"),
- "on", strlen("on")+1);
+ objdb->object_key_create_typed(object_handle, "timestamp",
+ "on", strlen("on")+1, OBJDB_VALUETYPE_STRING);
}
/* configure logfile */
if (objdb_get_string(objdb, object_handle, "to_logfile", &logstr)) {
- objdb->object_key_create(object_handle, "to_logfile", strlen("to_logfile"),
- "yes", strlen("yes")+1);
+ objdb->object_key_create_typed(object_handle, "to_logfile",
+ "yes", strlen("yes")+1, OBJDB_VALUETYPE_STRING);
}
if (objdb_get_string(objdb, object_handle, "logfile", &logstr)) {
- objdb->object_key_create(object_handle, "logfile", strlen("logfile"),
- LOGDIR "/corosync.log", strlen(LOGDIR "/corosync.log")+1);
+ objdb->object_key_create_typed(object_handle, "logfile",
+ LOGDIR "/corosync.log", strlen(LOGDIR "/corosync.log")+1, OBJDB_VALUETYPE_STRING);
}
if (objdb_get_string(objdb, object_handle, "logfile_priority", &logstr)) {
- objdb->object_key_create(object_handle, "logfile_priority", strlen("logfile_priority"),
- loglevel, strlen(loglevel)+1);
+ objdb->object_key_create_typed(object_handle, "logfile_priority",
+ loglevel, strlen(loglevel)+1, OBJDB_VALUETYPE_STRING);
}
/* syslog */
if (objdb_get_string(objdb, object_handle, "to_syslog", &logstr)) {
- objdb->object_key_create(object_handle, "to_syslog", strlen("to_syslog"),
- "yes", strlen("yes")+1);
+ objdb->object_key_create_typed(object_handle, "to_syslog",
+ "yes", strlen("yes")+1, OBJDB_VALUETYPE_STRING);
}
if (objdb_get_string(objdb, object_handle, "syslog_facility", &logstr)) {
- objdb->object_key_create(object_handle, "syslog_facility", strlen("syslog_facility"),
- logfacility, strlen(logfacility)+1);
+ objdb->object_key_create_typed(object_handle, "syslog_facility",
+ logfacility, strlen(logfacility)+1, OBJDB_VALUETYPE_STRING);
}
if (objdb_get_string(objdb, object_handle, "syslog_priority", &logstr)) {
- objdb->object_key_create(object_handle, "syslog_priority", strlen("syslog_priority"),
- loglevel, strlen(loglevel)+1);
+ objdb->object_key_create_typed(object_handle, "syslog_priority",
+ loglevel, strlen(loglevel)+1, OBJDB_VALUETYPE_STRING);
}
if (!debug) {
@@ -835,8 +834,8 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
}
if (debug) {
- objdb->object_key_create(object_handle, "to_stderr", strlen("to_stderr"),
- "yes", strlen("yes")+1);
+ objdb->object_key_create_typed(object_handle, "to_stderr",
+ "yes", strlen("yes")+1, OBJDB_VALUETYPE_STRING);
}
/* Make sure we allow connections from user/group "ais" */
@@ -846,10 +845,10 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
"aisexec", strlen("aisexec"));
}
objdb->object_find_destroy(find_handle);
- objdb->object_key_create(object_handle, "user", strlen("user"),
- "ais", strlen("ais") + 1);
- objdb->object_key_create(object_handle, "group", strlen("group"),
- "ais", strlen("ais") + 1);
+ objdb->object_key_create_typed(object_handle, "user",
+ "ais", strlen("ais") + 1, OBJDB_VALUETYPE_STRING);
+ objdb->object_key_create_typed(object_handle, "group",
+ "ais", strlen("ais") + 1, OBJDB_VALUETYPE_STRING);
objdb->object_find_create(cluster_parent_handle, "cman", strlen("cman"), &find_handle);
if (objdb->object_find_next(find_handle, &object_handle) == 0)
@@ -858,13 +857,13 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
sprintf(str, "%d", cluster_id);
- objdb->object_key_create(object_handle, "cluster_id", strlen("cluster_id"),
- str, strlen(str) + 1);
+ objdb->object_key_create_typed(object_handle, "cluster_id",
+ str, strlen(str) + 1, OBJDB_VALUETYPE_STRING);
if (two_node) {
sprintf(str, "%d", 1);
- objdb->object_key_create(object_handle, "two_node", strlen("two_node"),
- str, strlen(str) + 1);
+ objdb->object_key_create_typed(object_handle, "two_node",
+ str, strlen(str) + 1, OBJDB_VALUETYPE_STRING);
}
}
objdb->object_find_destroy(find_handle);
@@ -872,18 +871,18 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
/* Load the quorum service */
objdb->object_create(OBJECT_PARENT_HANDLE, &object_handle,
"service", strlen("service"));
- objdb->object_key_create(object_handle, "name", strlen("name"),
- "corosync_quorum", strlen("corosync_quorum") + 1);
- objdb->object_key_create(object_handle, "ver", strlen("ver"),
- "0", 2);
+ objdb->object_key_create_typed(object_handle, "name",
+ "corosync_quorum", strlen("corosync_quorum") + 1, OBJDB_VALUETYPE_STRING);
+ objdb->object_key_create_typed(object_handle, "ver",
+ "0", 2, OBJDB_VALUETYPE_STRING);
/* Make sure we load our alter-ego - the main cman module */
objdb->object_create(OBJECT_PARENT_HANDLE, &object_handle,
"service", strlen("service"));
- objdb->object_key_create(object_handle, "name", strlen("name"),
- "corosync_cman", strlen("corosync_cman") + 1);
- objdb->object_key_create(object_handle, "ver", strlen("ver"),
- "0", 2);
+ objdb->object_key_create_typed(object_handle, "name",
+ "corosync_cman", strlen("corosync_cman") + 1, OBJDB_VALUETYPE_STRING);
+ objdb->object_key_create_typed(object_handle, "ver",
+ "0", 2, OBJDB_VALUETYPE_STRING);
/* Define cman as the quorum provider for corosync */
objdb->object_find_create(OBJECT_PARENT_HANDLE, "quorum", strlen("quorum"), &find_handle);
@@ -893,8 +892,8 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
}
objdb->object_find_destroy(find_handle);
- objdb->object_key_create(object_handle, "provider", strlen("provider"),
- "quorum_cman", strlen("quorum_cman") + 1);
+ objdb->object_key_create_typed(object_handle, "provider",
+ "quorum_cman", strlen("quorum_cman") + 1, OBJDB_VALUETYPE_STRING);
}
/* If ccs is not available then use some defaults */
@@ -983,20 +982,20 @@ static int set_noccs_defaults(struct objdb_iface_ver0 *objdb)
"clusternodes", strlen("clusternodes"));
objdb->object_create(object_handle, &object_handle,
"clusternode", strlen("clusternode"));
- objdb->object_key_create(object_handle, "name", strlen("name"),
- nodename, strlen(nodename)+1);
+ objdb->object_key_create_typed(object_handle, "name",
+ nodename, strlen(nodename)+1, OBJDB_VALUETYPE_STRING);
sprintf(tmp, "%d", votes);
- objdb->object_key_create(object_handle, "votes", strlen("votes"),
- tmp, strlen(tmp)+1);
+ objdb->object_key_create_typed(object_handle, "votes",
+ tmp, strlen(tmp)+1, OBJDB_VALUETYPE_STRING);
sprintf(tmp, "%d", nodeid);
- objdb->object_key_create(object_handle, "nodeid", strlen("nodeid"),
- tmp, strlen(tmp)+1);
+ objdb->object_key_create_typed(object_handle, "nodeid",
+ tmp, strlen(tmp)+1, OBJDB_VALUETYPE_STRING);
/* Write the default cluster name & ID in here too */
- objdb->object_key_create(cluster_parent_handle, "name", strlen("name"),
- cluster_name, strlen(cluster_name)+1);
+ objdb->object_key_create_typed(cluster_parent_handle, "name",
+ cluster_name, strlen(cluster_name)+1, OBJDB_VALUETYPE_STRING);
objdb->object_find_create(cluster_parent_handle, "cman", strlen("cman"), &find_handle);
@@ -1006,12 +1005,12 @@ static int set_noccs_defaults(struct objdb_iface_ver0 *objdb)
"cman", strlen("cman"));
}
sprintf(tmp, "%d", cluster_id);
- objdb->object_key_create(object_handle, "cluster_id", strlen("cluster_id"),
- tmp, strlen(tmp)+1);
+ objdb->object_key_create_typed(object_handle, "cluster_id",
+ tmp, strlen(tmp)+1, OBJDB_VALUETYPE_STRING);
sprintf(tmp, "%d", expected_votes);
- objdb->object_key_create(object_handle, "expected_votes", strlen("expected_votes"),
- tmp, strlen(tmp)+1);
+ objdb->object_key_create_typed(object_handle, "expected_votes",
+ tmp, strlen(tmp)+1, OBJDB_VALUETYPE_STRING);
objdb->object_find_destroy(find_handle);
return 0;
@@ -1045,8 +1044,8 @@ static int copy_config_tree(struct objdb_iface_ver0 *objdb, hdb_handle_t source_
while (!objdb->object_key_iter(source_object, &key_name, &key_name_len,
&key_value, &key_value_len)) {
- objdb->object_key_create(new_object, key_name, key_name_len,
- key_value, key_value_len);
+ objdb->object_key_create_typed(new_object, key_name,
+ key_value, key_value_len, OBJDB_VALUETYPE_STRING);
}
/* Create sub-objects */
@@ -1211,8 +1210,8 @@ static void setup_old_compat(struct objdb_iface_ver0 *objdb, hdb_handle_t cluste
if (objdb->object_key_get(groupd_handle, groupd_compat, strlen(groupd_compat),
(void *)&value, NULL) ||
!value) {
- objdb->object_key_create(groupd_handle, groupd_compat, strlen(groupd_compat),
- "1", 2);
+ objdb->object_key_create_typed(groupd_handle, groupd_compat,
+ "1", 2, OBJDB_VALUETYPE_STRING);
}
/* Make clvmd use cman */
@@ -1220,8 +1219,8 @@ static void setup_old_compat(struct objdb_iface_ver0 *objdb, hdb_handle_t cluste
if (objdb->object_key_get(clvmd_handle, clvmd_interface, strlen(clvmd_interface),
(void *)&value, NULL) ||
!value) {
- objdb->object_key_create(clvmd_handle, clvmd_interface, strlen(clvmd_interface),
- "cman", 5);
+ objdb->object_key_create_typed(clvmd_handle, clvmd_interface,
+ "cman", 5, OBJDB_VALUETYPE_STRING);
}
/* Make cman use disallowed mode */
@@ -1229,8 +1228,8 @@ static void setup_old_compat(struct objdb_iface_ver0 *objdb, hdb_handle_t cluste
if (objdb->object_key_get(cman_handle, cman_disallowed, strlen(cman_disallowed),
(void *)&value, NULL) ||
!value) {
- objdb->object_key_create(cman_handle, cman_disallowed, strlen(cman_disallowed),
- "1", 2);
+ objdb->object_key_create_typed(cman_handle, cman_disallowed,
+ "1", 2, OBJDB_VALUETYPE_STRING);
}
/* Make totem use the old communications method */
@@ -1238,8 +1237,8 @@ static void setup_old_compat(struct objdb_iface_ver0 *objdb, hdb_handle_t cluste
if (objdb->object_key_get(totem_handle, totem_crypto, strlen(totem_crypto),
(void *)&value, NULL) ||
!value) {
- objdb->object_key_create(totem_handle, totem_crypto, strlen(totem_crypto),
- "old", 4);
+ objdb->object_key_create_typed(totem_handle, totem_crypto,
+ "old", 4, OBJDB_VALUETYPE_STRING);
}
}
@@ -1295,8 +1294,8 @@ static int cmanpre_readconfig(struct objdb_iface_ver0 *objdb, const char **error
objdb->object_create(OBJECT_PARENT_HANDLE, &object_handle,
"libccs", strlen("libccs"));
- objdb->object_key_create(object_handle, "next_handle", strlen("next_handle"),
- &next_handle, sizeof(int));
+ objdb->object_key_create_typed(object_handle, "next_handle",
+ &next_handle, sizeof(uint32_t), OBJDB_VALUETYPE_UINT32);
}
objdb->object_find_destroy(find_handle);
diff --git a/config/libs/libccsconfdb/libccs.c b/config/libs/libccsconfdb/libccs.c
index 6dc09a5..6a2b143 100644
--- a/config/libs/libccsconfdb/libccs.c
+++ b/config/libs/libccsconfdb/libccs.c
@@ -241,9 +241,9 @@ static hdb_handle_t create_ccs_handle(confdb_handle_t handle, int ccs_handle,
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf), "%d", ccs_handle);
- if (confdb_key_create
- (handle, connection_handle, "ccs_handle", strlen("ccs_handle"), buf,
- strlen(buf) + 1) != CS_OK) {
+ if (confdb_key_create_typed
+ (handle, connection_handle, "ccs_handle", buf,
+ strlen(buf) + 1, CONFDB_VALUETYPE_STRING) != CS_OK) {
destroy_ccs_handle(handle, connection_handle);
errno = ENOMEM;
return -1;
@@ -251,9 +251,9 @@ static hdb_handle_t create_ccs_handle(confdb_handle_t handle, int ccs_handle,
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf), "%d", config_version);
- if (confdb_key_create
+ if (confdb_key_create_typed
(handle, connection_handle, "config_version",
- strlen("config_version"), buf, strlen(buf) + 1) != CS_OK) {
+ buf, strlen(buf) + 1, CONFDB_VALUETYPE_STRING) != CS_OK) {
destroy_ccs_handle(handle, connection_handle);
errno = ENOMEM;
return -1;
@@ -261,9 +261,9 @@ static hdb_handle_t create_ccs_handle(confdb_handle_t handle, int ccs_handle,
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf), "%d", xpath);
- if (confdb_key_create
- (handle, connection_handle, "fullxpath", strlen("fullxpath"), buf,
- strlen(buf) + 1) != CS_OK) {
+ if (confdb_key_create_typed
+ (handle, connection_handle, "fullxpath", buf,
+ strlen(buf) + 1, CONFDB_VALUETYPE_STRING) != CS_OK) {
destroy_ccs_handle(handle, connection_handle);
errno = ENOMEM;
return -1;
@@ -342,10 +342,10 @@ int set_previous_query(confdb_handle_t handle, hdb_handle_t connection_handle,
}
}
} else {
- if (confdb_key_create
+ if (confdb_key_create_typed
(handle, connection_handle, "previous_query",
- strlen("previous_query"), previous_query,
- strlen(previous_query) + 1) != CS_OK) {
+ previous_query,
+ strlen(previous_query) + 1, CONFDB_VALUETYPE_STRING) != CS_OK) {
errno = ENOMEM;
return -1;
}
@@ -365,10 +365,10 @@ int set_previous_query(confdb_handle_t handle, hdb_handle_t connection_handle,
}
}
} else {
- if (confdb_key_create
+ if (confdb_key_create_typed
(handle, connection_handle, "query_handle",
- strlen("query_handle"), &query_handle,
- sizeof(hdb_handle_t)) != CS_OK) {
+ &query_handle,
+ sizeof(hdb_handle_t), CONFDB_VALUETYPE_UINT64) != CS_OK) {
errno = ENOMEM;
return -1;
}
@@ -378,10 +378,9 @@ int set_previous_query(confdb_handle_t handle, hdb_handle_t connection_handle,
(handle, connection_handle, "iterator_tracker",
strlen("iterator_tracker"), &temptracker, &templen) != CS_OK) {
temptracker = 1;
- if (confdb_key_create
+ if (confdb_key_create_typed
(handle, connection_handle, "iterator_tracker",
- strlen("iterator_tracker"), &temptracker,
- sizeof(unsigned int)) != CS_OK) {
+ &temptracker, sizeof(unsigned int), CONFDB_VALUETYPE_UINT32) != CS_OK) {
errno = ENOMEM;
return -1;
}
diff --git a/config/plugins/ldap/configldap.c b/config/plugins/ldap/configldap.c
index 4877f61..fb25af4 100644
--- a/config/plugins/ldap/configldap.c
+++ b/config/plugins/ldap/configldap.c
@@ -237,9 +237,10 @@ static int read_config_for(LDAP *ld, struct objdb_iface_ver0 *objdb, hdb_handle_
*/
if (strcmp("objectClass", attr) &&
strcmp("cn", attr)) {
- objdb->object_key_create(object_handle, attr, strlen(attr),
+ objdb->object_key_create_typed(object_handle, attr,
val_ber[i]->bv_val,
- val_ber[i]->bv_len+1);
+ val_ber[i]->bv_len+1,
+ OBJDB_VALUETYPE_STRING);
}
i++;
}
diff --git a/config/plugins/xml/config.c b/config/plugins/xml/config.c
index dba9891..1db23da 100644
--- a/config/plugins/xml/config.c
+++ b/config/plugins/xml/config.c
@@ -56,13 +56,13 @@ static void addkeys(xmlAttrPtr tmpattr, struct objdb_iface_ver0 *objdb,
{
for (tmpattr = tmpattr; tmpattr; tmpattr = tmpattr->next) {
if (tmpattr->type == XML_ATTRIBUTE_NODE)
- objdb->object_key_create(object_handle,
+ objdb->object_key_create_typed(object_handle,
(char *)tmpattr->name,
- strlen((char *)tmpattr->name),
(char *)tmpattr->children->
content,
strlen((char *)tmpattr->
- children->content) + 1);
+ children->content) + 1,
+ OBJDB_VALUETYPE_STRING);
}
}
14 years, 4 months
- 1
- 0
cluster: STABLE3 - fence agents: man page clean up
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 2369ffed5d9f58c57a36d24712a05049fee9d1b3
Parent: e2abd6bcab89e2d2d0bd76948737e6602ab594d9
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Thu Jan 14 10:38:59 2010 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Thu Jan 14 10:38:59 2010 +0100
fence agents: man page clean up
ship agents man pages from agent directory
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
fence/agents/alom/Makefile | 2 +-
fence/agents/apc/Makefile | 2 +-
fence/agents/apc_snmp/Makefile | 2 +-
fence/agents/baytech/fence_baytech.8 | 82 ++++++++++++++++++
fence/agents/bladecenter/Makefile | 2 +-
fence/agents/brocade/fence_brocade.8 | 82 ++++++++++++++++++
fence/agents/bullpap/fence_bullpap.8 | 71 ++++++++++++++++
fence/agents/cisco_mds/Makefile | 2 +-
fence/agents/cpint/fence_cpint.8 | 52 ++++++++++++
fence/agents/drac/fence_drac.8 | 97 ++++++++++++++++++++++
fence/agents/drac5/Makefile | 2 +-
fence/agents/egenera/fence_egenera.8 | 70 ++++++++++++++++
fence/agents/eps/Makefile | 2 +-
fence/agents/ibmblade/Makefile | 2 +-
fence/agents/ifmib/Makefile | 2 +-
fence/agents/ilo/Makefile | 2 +-
fence/agents/ilo_mp/Makefile | 2 +-
fence/agents/intelmodular/Makefile | 2 +-
fence/agents/ldom/Makefile | 2 +-
fence/agents/lpar/Makefile | 2 +-
fence/agents/manual/Makefile | 2 +
fence/agents/manual/fence_ack_manual.8 | 39 +++++++++
fence/agents/mcdata/fence_mcdata.8 | 82 ++++++++++++++++++
fence/agents/rackswitch/Makefile | 2 +
fence/agents/rackswitch/fence_rackswitch.8 | 68 +++++++++++++++
fence/agents/rsa/Makefile | 2 +-
fence/agents/rsb/fence_rsb.8 | 75 +++++++++++++++++
fence/agents/sanbox2/Makefile | 2 +-
fence/agents/scsi/fence_scsi.8 | 109 ++++++++++++++++++++++++
fence/agents/virsh/Makefile | 2 +-
fence/agents/vixel/fence_vixel.8 | 70 ++++++++++++++++
fence/agents/vmware/Makefile | 1 +
fence/agents/wti/Makefile | 2 +-
fence/agents/xcat/fence_xcat.8 | 61 ++++++++++++++
fence/agents/xvm/Makefile | 2 +
fence/agents/xvm/fence_xvmd.8 | 124 ++++++++++++++++++++++++++++
fence/agents/zvm/fence_zvm.8 | 62 ++++++++++++++
fence/man/Makefile | 20 -----
fence/man/fence_ack_manual.8 | 39 ---------
fence/man/fence_baytech.8 | 82 ------------------
fence/man/fence_brocade.8 | 82 ------------------
fence/man/fence_bullpap.8 | 71 ----------------
fence/man/fence_cpint.8 | 52 ------------
fence/man/fence_drac.8 | 97 ----------------------
fence/man/fence_egenera.8 | 70 ----------------
fence/man/fence_mcdata.8 | 82 ------------------
fence/man/fence_rackswitch.8 | 68 ---------------
fence/man/fence_rib.8 | 10 --
fence/man/fence_rsb.8 | 75 -----------------
fence/man/fence_scsi.8 | 109 ------------------------
fence/man/fence_vixel.8 | 70 ----------------
fence/man/fence_xcat.8 | 61 --------------
fence/man/fence_xvmd.8 | 124 ----------------------------
fence/man/fence_zvm.8 | 62 --------------
make/fencebuild.mk | 7 ++
make/release.mk | 6 +-
56 files changed, 1177 insertions(+), 1197 deletions(-)
diff --git a/fence/agents/alom/Makefile b/fence/agents/alom/Makefile
index 08d5843..d92eeb7 100644
--- a/fence/agents/alom/Makefile
+++ b/fence/agents/alom/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_alom
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/apc/Makefile b/fence/agents/apc/Makefile
index 53ef7f2..fabf52c 100644
--- a/fence/agents/apc/Makefile
+++ b/fence/agents/apc/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_apc
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/apc_snmp/Makefile b/fence/agents/apc_snmp/Makefile
index 733842e..3834702 100644
--- a/fence/agents/apc_snmp/Makefile
+++ b/fence/agents/apc_snmp/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_apc_snmp
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/baytech/fence_baytech.8 b/fence/agents/baytech/fence_baytech.8
new file mode 100644
index 0000000..e60175d
--- /dev/null
+++ b/fence/agents/baytech/fence_baytech.8
@@ -0,0 +1,82 @@
+.TH fence_baytech 8
+
+.SH NAME
+fence_baytech - I/O Fencing agent for Baytech RPC switches in combination with a Cyclades Terminal Server
+
+.SH SYNOPSIS
+.B
+fence_baytech
+[\fIOPTION\fR]...
+
+.SH DESCRIPTION
+
+This fencing agent is written for the Baytech RPC27-20nc in combination with
+a Cyclades terminal server. The Cyclades TS exports the RPC's serial port
+via a Telnet interface. Other interfaces, such as SSH, are possible.
+However, this script relies upon the assumption that Telnet is used. Future
+features to this agent would allow the agent to work with a multitude of
+different communication protocols such as Telnet, SSH or Kermit.
+
+The other assumption that is made is that Outlet names do not end in space.
+The name "Foo" and "Foo " are identical when the RPC prints them with
+the status command.
+
+fence_baytech accepts options on the command line as well as from stdin.
+fenced sends parameters through stdin when it execs the agent. fence_baytech
+can be run by itself with command line options which is useful for testing.
+
+.SH OPTIONS
+.TP
+\fB-a\fP \fIhost\fP
+IP address or hostname to connect to.
+.TP
+\fB-h\fP
+Print out a help message describing available options, then exit.
+.TP
+\fB-l\fP \fIlogin\fP
+Username name for the switch.
+.TP
+\fB-n\fP \fIport\fP
+The name of the outlet to act upon.
+.TP
+\fB-o\fP \fIaction\fP
+The action required. This can be on, off, status or reboot (default)
+.TP
+\fB-p\fP \fIpassword\fP
+Password for login.
+.TP
+\fB-S\fP \fIpath\fR
+Full path to an executable to generate the password for login.
+.TP
+\fB-q\fP
+Quiet mode: print only error messages.
+.TP
+\fB-V\fP
+Print out a version message, then exit.
+
+.SH STDIN PARAMETERS
+
+.TP
+\fIagent = < param >\fR
+This option is used by fence_node(8) and is ignored by fence_baytech.
+.TP
+\fIhost = < hostname | ip >\fR
+IP address or hostname to connect to.
+.TP
+\fIlogin = < param >\fR
+Login name.
+.TP
+\fIaction = < param >\fR
+The action required. This can be on, off, status or reboot (default)
+.TP
+\fIpasswd = < param >\fR
+Password for login.
+.TP
+\fIpasswd_script = < param >\fR
+Full path to an executable to generate the password for login.
+.TP
+\fIoutlet = < param >\fR
+The name of the outlet to act upon.
+
+.SH SEE ALSO
+fence(8), fence_node(8)
diff --git a/fence/agents/bladecenter/Makefile b/fence/agents/bladecenter/Makefile
index 1425812..76b2a2c 100644
--- a/fence/agents/bladecenter/Makefile
+++ b/fence/agents/bladecenter/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_bladecenter
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/brocade/fence_brocade.8 b/fence/agents/brocade/fence_brocade.8
new file mode 100644
index 0000000..36fde82
--- /dev/null
+++ b/fence/agents/brocade/fence_brocade.8
@@ -0,0 +1,82 @@
+.TH fence_brocade 8
+
+.SH NAME
+fence_brocade - I/O Fencing agent for Brocade FC switches
+
+.SH SYNOPSIS
+.B
+fence_brocade
+[\fIOPTION\fR]...
+
+.SH DESCRIPTION
+fence_brocade is an I/O Fencing agent which can be used with Brocade FC
+switches. It logs into a Brocade switch via telnet and disables a specified
+port. Disabling the port which a machine is connected to effectively fences
+that machine. Lengthy telnet connections to the switch should be avoided
+while a GFS cluster is running because the connection will block any necessary
+fencing actions.
+
+fence_brocade accepts options on the command line as well as from stdin.
+fenced sends parameters through stdin when it execs the agent. fence_brocade
+can be run by itself with command line options which is useful for testing.
+
+After a fence operation has taken place the fenced machine can no longer connect
+to the Brocade FC switch. When the fenced machine is ready to be brought back
+into the GFS cluster (after reboot) the port on the Brocade FC switch needs to
+be enabled. This can be done by running fence_brocade and specifying the
+enable action.
+
+.SH OPTIONS
+.TP
+\fB-a\fP \fIIPaddress\fP
+IP address of the switch.
+.TP
+\fB-h\fP
+Print out a help message describing available options, then exit.
+.TP
+\fB-l\fP \fIlogin\fP
+Login name for the switch.
+.TP
+\fB-n\fP \fIport\fP
+The port number to disable on the switch.
+.TP
+\fB-o\fP \fIaction\fP
+The action required. disable (default) or enable.
+.TP
+\fB-p\fP \fIpassword\fP
+Password for login.
+.TP
+\fB-S\fP \fIpath\fR
+Full path to an executable to generate the password for login.
+.TP
+\fB-q\fP
+Quiet mode: print only error messages.
+.TP
+\fB-V\fP
+Print out a version message, then exit.
+
+.SH STDIN PARAMETERS
+.TP
+\fIagent = < param >\fR
+This option is used by fence_node(8) and is ignored by fence_brocade.
+.TP
+\fIipaddr = < hostname | ip >\fR
+IP address or hostname of the switch.
+.TP
+\fIlogin = < param >\fR
+Login name.
+.TP
+\fIoption = < param >\fR
+The action required. disable (default) or enable.
+.TP
+\fIpasswd = < param >\fR
+Password for login.
+.TP
+\fIpasswd_script = < param >\fR
+Full path to an executable to generate the password for login.
+.TP
+\fIport = < param >\fR
+The port number to disable on the switch.
+
+.SH SEE ALSO
+fence(8), fence_node(8)
diff --git a/fence/agents/bullpap/fence_bullpap.8 b/fence/agents/bullpap/fence_bullpap.8
new file mode 100644
index 0000000..876b406
--- /dev/null
+++ b/fence/agents/bullpap/fence_bullpap.8
@@ -0,0 +1,71 @@
+.TH fence_bullpap 8
+
+.SH NAME
+fence_bullpap - I/O Fencing agent for Bull FAME architecture controlled by a
+PAP management console.
+
+.SH SYNOPSIS
+.B
+fence_bullpap
+[\fIOPTION\fR]...
+
+.SH DESCRIPTION
+fence_bullpap is an I/O Fencing agent which can be used with Bull's NovaScale
+machines controlled by PAP management consoles. This agent calls Bull's
+support software provided by the NSMasterHW RPM available from Bull.
+
+fence_bullpap accepts options on the command line as well as from stdin.
+fenced sends the options through stdin when it execs the agent. fence_bullpap
+can be run by itself with command line options which is useful for testing.
+
+.SH OPTIONS
+.TP
+\fB-a\fP \fIIPaddress\fP
+IP address or hostname of the PAP management console.
+.TP
+\fB-h\fP
+Print out a help message describing available options, then exit.
+.TP
+\fB-l\fP \fIlogin\fP
+Login with administrative privileges.
+.TP
+\fB-d\fP \fIdomain\fP
+This is the domain name of the Bull machine to power-cycle.
+.TP
+\fB-o\fP \fIoption\fP
+Action to perform (on, off, reboot, status).
+.TP
+\fB-p\fP \fIpassword\fP
+Password for login.
+.TP
+\fB-S\fP \fIpath\fR
+Full path to an executable to generate the password for login.
+.TP
+\fB-q\fP
+Quiet operation. Only print out error messages.
+.TP
+\fB-V\fP
+Print out a version message, then exit.
+
+.SH STDIN PARAMETERS
+.TP
+\fIipaddr = < hostname | ip >\fR
+IP address or hostname of the PAP management console.
+.TP
+\fIlogin= < param >\fR
+Login with administrative privileges.
+.TP
+\fIdomain = < param >\fR
+This is the domain name of the Bull machine to power-cycle.
+.TP
+\fIoption = < param >\fR
+Action to perform (on, off, reboot, status).
+.TP
+\fIpasswd = < param >\fR
+Password for login.
+.TP
+\fIpasswd_script = < param >\fR
+Full path to an executable to generate the password for login.
+
+.SH SEE ALSO
+fence(8), fence_node(8)
diff --git a/fence/agents/cisco_mds/Makefile b/fence/agents/cisco_mds/Makefile
index 2154ec8..6b2cc85 100644
--- a/fence/agents/cisco_mds/Makefile
+++ b/fence/agents/cisco_mds/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_cisco_mds
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/cpint/fence_cpint.8 b/fence/agents/cpint/fence_cpint.8
new file mode 100644
index 0000000..efbaa7e
--- /dev/null
+++ b/fence/agents/cpint/fence_cpint.8
@@ -0,0 +1,52 @@
+.TH fence_cpint 8
+
+.SH NAME
+fence_cpint - I/O Fencing agent for GFS on s390 and zSeries VM clusters
+
+.SH SYNOPSIS
+.B
+fence_cpint
+[\fIOPTION\fR]...
+
+.SH DESCRIPTION
+fence_cpint is an I/O Fencing agent used on a virtual machine running GFS in a
+s390 or zSeries VM cluster.
+It uses the cpint package to send a CP LOGOFF command to the specified virtual
+machine.
+For fence_cpint to execute correctly, you must have the cpint module installed,
+and hcp in your PATH.
+\fBNOTE:\fP for fence_cpint to send a command to another virtual machine, the
+machine executing it must either be a privilege class C user or it must be
+the secondary user of the virtual machine to be fenced. This means that unless
+all of you GULM server nodes are privilege class C, fence_cpint can only be
+used with SLM.
+
+fence_cpint accepts options on the command line as well as from stdin.
+fence_node sends the options through stdin when it execs the agent.
+fence_cpint can be run by itself with command line options which is useful for
+testing.
+
+.SH OPTIONS
+.TP
+\fB-h\fP
+Print out a help message describing available options, then exit.
+.TP
+\fB-u\fP \fIuserid\fP
+userid of the virtual machine to fence (required).
+.TP
+\fB-q\fP
+quiet mode, no output.
+.TP
+\fB-V\fP
+Print out a version message, then exit.
+
+.SH STDIN PARAMETERS
+.TP
+\fIagent = < param >\fR
+This option is used by fence_node(8) and is ignored by fence_cpint.
+.TP
+\fIuserid = < parm >\fP
+userid of the virtual machine to fence (required).
+
+.SH SEE ALSO
+fence(8), fence_node(8)
diff --git a/fence/agents/drac/fence_drac.8 b/fence/agents/drac/fence_drac.8
new file mode 100644
index 0000000..8dda184
--- /dev/null
+++ b/fence/agents/drac/fence_drac.8
@@ -0,0 +1,97 @@
+.TH fence_drac 8
+
+.SH NAME
+fence_drac - fencing agent for Dell Remote Access Card
+
+.SH SYNOPSIS
+.B
+fence_drac
+[\fIOPTION\fR]...
+
+.SH DESCRIPTION
+fence_drac is an I/O Fencing agent which can be used with the Dell Remote
+Access Card (DRAC). This card provides remote access to controlling
+power to a server. It logs into the DRAC through the telnet interface of
+the card. By default, the telnet interface is not enabled. To enable the
+interface, you will need to use the racadm command in the racser-devel rpm
+available from Dell. To enable telnet on the DRAC:
+
+[root]# racadm config -g cfgSerial -o cfgSerialTelnetEnable 1
+
+[root]# racadm racreset
+
+fence_drac accepts options on the command line as well as from stdin.
+Fenced sends parameters through stdin when it execs the agent. fence_drac
+can be run by itself with command line options. This is useful for testing
+and for turning outlets on or off from scripts.
+
+.SH OPTIONS
+.TP
+\fB-a\fP \fIIPaddress\fR
+IP address or hostname of the switch.
+.TP
+\fB-c\fP \fIcmd_prompt\fR
+Force fence_drac to use cmd_prompt as the command prompt
+.TP
+\fB-d\fP \fIdracversion\fR
+Force fence_drac to treat the device as though it was for the specified drac version
+.TP
+\fB-D\fP \fIdumpfile\fR
+Debug file of the telnet interaction
+.TP
+\fB-h\fP
+Print out a help message describing available options, then exit.
+.TP
+\fB-l\fP \fIlogin\fR
+Login name.
+.TP
+\fB-m\fP \fImodulename\fR
+The module name of the blade when using DRAC/MC firmware.
+.TP
+\fB-o\fP \fIaction\fR
+The action required. reboot (default), off, on or status.
+.TP
+\fB-p\fP \fIpassword\fR
+Password for login.
+.TP
+\fB-S\fP \fIpath\fR
+Full path to an executable to generate the password for login.
+.TP
+\fB-V\fP
+Print out a version message, then exit.
+
+.SH STDIN PARAMETERS
+.TP
+\fIaction = < param >\fR
+The action required. reboot (default), off, on or status.
+.TP
+\fIagent = < param >\fR
+This option is used by fence_node(8) and is ignored by fence_apc.
+.TP
+\fIcmd_prompt = < param >\fr
+Force fence_drac to use cmd_prompt as the command prompt
+.TP
+\fIdrac_version = < param >\fr
+Force fence_drac to treat the device as though it was for the specified drac version.
+.TP
+\fIdebug = < dumpfile >\fR
+Debug file of the telnet interaction
+.TP
+\fIipaddr = < hostname | ip >\fR
+IP address or hostname of the switch.
+.TP
+\fIlogin = < param >\fR
+Login name.
+.TP
+\fImodulename = < param >\fr
+The module name of the blade when using DRAC/MC firmware.
+.TP
+\fIpasswd = < param >\fR
+Password for login.
+.TP
+\fIpasswd_script = < param >\fR
+Full path to an executable to generate the password for login.
+.TP
+
+.SH SEE ALSO
+fence(8), fence_node(8)
diff --git a/fence/agents/drac5/Makefile b/fence/agents/drac5/Makefile
index 5db5ad9..4f74c52 100644
--- a/fence/agents/drac5/Makefile
+++ b/fence/agents/drac5/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_drac5
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/egenera/fence_egenera.8 b/fence/agents/egenera/fence_egenera.8
new file mode 100644
index 0000000..cfa839e
--- /dev/null
+++ b/fence/agents/egenera/fence_egenera.8
@@ -0,0 +1,70 @@
+.TH fence_egenera 8
+
+.SH NAME
+fence_egenera - I/O Fencing agent for the Egenera BladeFrame
+
+.SH SYNOPSIS
+.B
+fence_egenera
+[\fIOPTION\fR]...
+
+.SH DESCRIPTION
+fence_egenera is an I/O Fencing agent which can be used with the Egenera
+BladeFrame. It logs into a control blade (cserver) via ssh and operates
+on a processing blade (pserver) identified by the pserver name and the
+logical process area network (LPAN) that it is in. fence_egenera requires
+that ssh keys have been setup so that the fence_egenera does not require
+a password to authenticate. Refer to ssh(8) for more information on setting
+up ssh keys.
+
+fence_egenera accepts options on the command line as well as from stdin.
+Fenced sends parameters through stdin when it execs the agent. fence_egenera
+can also be run by itself with command line options.
+
+.SH OPTIONS
+.TP
+\fB-c\fP \fIcserver\fR
+The cserver to ssh to. cserver can be in the form user@hostname to
+specify a different user to login as.
+.TP
+\fB-h\fP
+Print out a help message describing available options, then exit.
+.TP
+\fB-l\fP \fIlpan\fR
+the lpan to operate on
+.TP
+\fB-o\fP \fIaction\fR
+The action required. reboot (default), off, on or status.
+.TP
+\fB-p\fP \fIpserver\fR
+the pserver to operate on
+.TP
+\fB-q\fP
+quite mode. suppress output.
+.TP
+\fB-V\fP
+Print out a version message, then exit.
+
+.SH STDIN PARAMETERS
+.TP
+\fIaction = < param >\fR
+The action required. reboot (default), off, on or status.
+.TP
+\fIagent = < param >\fR
+This option is used by fence_node(8) and is ignored by fence_apc.
+.TP
+\fIcserver = < param >\fR
+The cserver to ssh to. cserver can be in the form user@hostname to
+specify a different user to login as.
+.TP
+\fIlpan = < param >\fR
+The lpan to operate on
+.TP
+\fIpserver = < param >\fR
+The pserver to operate on
+.TP
+\fIesh = < param >\fR
+The path to the esh command on the cserver (default is /opt/panmgr/bin/esh)
+
+.SH SEE ALSO
+fence(8), fence_node(8), ssh(8)
diff --git a/fence/agents/eps/Makefile b/fence/agents/eps/Makefile
index 0cdba17..3d591da 100644
--- a/fence/agents/eps/Makefile
+++ b/fence/agents/eps/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_eps
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/ibmblade/Makefile b/fence/agents/ibmblade/Makefile
index 23d49c1..91f3e2a 100644
--- a/fence/agents/ibmblade/Makefile
+++ b/fence/agents/ibmblade/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_ibmblade
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/ifmib/Makefile b/fence/agents/ifmib/Makefile
index d3745ad..64f4448 100644
--- a/fence/agents/ifmib/Makefile
+++ b/fence/agents/ifmib/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_ifmib
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/ilo/Makefile b/fence/agents/ilo/Makefile
index fe4c712..aafe6e4 100644
--- a/fence/agents/ilo/Makefile
+++ b/fence/agents/ilo/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_ilo
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/ilo_mp/Makefile b/fence/agents/ilo_mp/Makefile
index b4bc456..42ffb03 100644
--- a/fence/agents/ilo_mp/Makefile
+++ b/fence/agents/ilo_mp/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_ilo_mp
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/intelmodular/Makefile b/fence/agents/intelmodular/Makefile
index 7ff7668..e7509e6 100644
--- a/fence/agents/intelmodular/Makefile
+++ b/fence/agents/intelmodular/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_intelmodular
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/ldom/Makefile b/fence/agents/ldom/Makefile
index 821bc21..fb9de6c 100644
--- a/fence/agents/ldom/Makefile
+++ b/fence/agents/ldom/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_ldom
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/lpar/Makefile b/fence/agents/lpar/Makefile
index fed1b2b..2ee6491 100644
--- a/fence/agents/lpar/Makefile
+++ b/fence/agents/lpar/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_lpar
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/manual/Makefile b/fence/agents/manual/Makefile
index 490100f..ff4bde2 100644
--- a/fence/agents/manual/Makefile
+++ b/fence/agents/manual/Makefile
@@ -1,5 +1,7 @@
TARGET= fence_ack_manual
+MANTARGET=$(TARGET).8
+
SBINDIRT=$(TARGET)
all: ${TARGET}
diff --git a/fence/agents/manual/fence_ack_manual.8 b/fence/agents/manual/fence_ack_manual.8
new file mode 100644
index 0000000..6b4cd14
--- /dev/null
+++ b/fence/agents/manual/fence_ack_manual.8
@@ -0,0 +1,39 @@
+.TH FENCE_ACK_MANUAL 8 2009-12-21 cluster cluster
+
+.SH NAME
+fence_ack_manual \- a program to override fenced fencing operations
+
+.SH SYNOPSIS
+.B fence_ack_manual
+[OPTIONS]
+.I nodename
+
+.SH DESCRIPTION
+When
+.BR fenced (8)
+fails to fence a node, it retries indefinately.
+.BR fence_ack_manual (8)
+tells fenced to stop retrying and consider the node fenced.
+
+.P
+It is important that this only be done after the node has been manually
+turned off or prevented from writing to shared storage.
+Without this manual action and verification, the storage that fencing
+protects may become corrupted.
+
+.P
+When fenced fences a node that has no fence devices defined in the cluster
+configuration, the fencing operation fails. This failure will be repeated
+indefinately until fence_ack_manual is run by an operator to indicate
+the node is in a safe state to proceed.
+(Defining no fencing devices for node is the equivalent of using the
+fence_manual agent in previous versions.)
+
+.SH OPTIONS
+.TP
+.B \-h
+Print a help message describing available options, then exit.
+
+.SH SEE ALSO
+.BR fenced (8)
+
diff --git a/fence/agents/mcdata/fence_mcdata.8 b/fence/agents/mcdata/fence_mcdata.8
new file mode 100644
index 0000000..2230a66
--- /dev/null
+++ b/fence/agents/mcdata/fence_mcdata.8
@@ -0,0 +1,82 @@
+.TH fence_mcdata 8
+
+.SH NAME
+fence_mcdata - I/O Fencing agent for McData FC switches
+
+.SH SYNOPSIS
+.B
+fence_mcdata
+[\fIOPTION\fR]...
+
+.SH DESCRIPTION
+fence_mcdata is an I/O Fencing agent which can be used with McData FC
+switches. It logs into a McData switch via telnet and disables a specified
+port. Disabling the port which a machine is connected to effectively fences
+that machine. Lengthy telnet connections to the switch should be avoided
+while a GFS cluster is running because the connection will block any necessary
+fencing actions.
+
+fence_mcdata accepts options on the command line as well as from stdin.
+fenced sends parameters through stdin when it execs the agent. fence_mcdata
+can be run by itself with command line options which is useful for testing.
+
+After a fence operation has taken place the fenced machine can no longer connect
+to the McData FC switch. When the fenced machine is ready to be brought back
+into the GFS cluster (after reboot) the port on the McData FC switch needs to
+be enabled. This can be done by running fence_mcdata and specifying the
+enable action.
+
+.SH OPTIONS
+.TP
+\fB-a\fP \fIIPaddress\fP
+IP address of the switch.
+.TP
+\fB-h\fP
+Print out a help message describing available options, then exit.
+.TP
+\fB-l\fP \fIlogin\fP
+Username name for the switch.
+.TP
+\fB-n\fP \fIport\fP
+The port number to disable on the switch.
+.TP
+\fB-o\fP \fIaction\fP
+The action required. disable (default) or enable.
+.TP
+\fB-p\fP \fIpassword\fP
+Password for login.
+.TP
+\fB-S\fP \fIpath\fR
+Full path to an executable to generate the password for login.
+.TP
+\fB-q\fP
+Quiet mode: print only error messages.
+.TP
+\fB-V\fP
+Print out a version message, then exit.
+
+.SH STDIN PARAMETERS
+.TP
+\fIagent = < param >\fR
+This option is used by fence_node(8) and is ignored by fence_mcdata.
+.TP
+\fIipaddr = < hostname | ip >\fR
+IP address or hostname of the switch.
+.TP
+\fIlogin = < param >\fR
+Login name.
+.TP
+\fIoption = < param >\fR
+The action required. disable (default) or enable.
+.TP
+\fIpasswd = < param >\fR
+Password for login.
+.TP
+\fIpasswd_script = < param >\fR
+Full path to an executable to generate the password for login.
+.TP
+\fIport = < param >\fR
+The port number to disable on the switch.
+
+.SH SEE ALSO
+fence(8), fence_node(8)
diff --git a/fence/agents/rackswitch/Makefile b/fence/agents/rackswitch/Makefile
index 71334d5..05ee5af 100644
--- a/fence/agents/rackswitch/Makefile
+++ b/fence/agents/rackswitch/Makefile
@@ -1,5 +1,7 @@
TARGET= fence_rackswitch
+MANTARGET = fence_rackswitch.8
+
SBINDIRT=$(TARGET)
all: ${TARGET}
diff --git a/fence/agents/rackswitch/fence_rackswitch.8 b/fence/agents/rackswitch/fence_rackswitch.8
new file mode 100644
index 0000000..4f662c7
--- /dev/null
+++ b/fence/agents/rackswitch/fence_rackswitch.8
@@ -0,0 +1,68 @@
+.TH fence_rackswitch 8
+
+.SH NAME
+fence_rackswitch - I/O Fencing agent for RackSaver RackSwitch
+
+.SH SYNOPSIS
+.B
+fence_rackswitch
+[\fIOPTION\fR]...
+
+.SH DESCRIPTION
+fence_rackswitch is an I/O Fencing agent which can be used with the RackSaver
+RackSwitch. It logs into the RackSwitch and boots a specified plug.
+Using the http interface to the RackSwitch should be avoided while a GFS cluster is
+running because the connection may interfere with the operation of this agent.
+
+fence_rackswitch accepts options on the command line as well as from stdin.
+fenced sends the options through stdin when it execs the agent. fence_rackswitch
+can be run by itself with command line options which is useful for testing.
+
+.SH OPTIONS
+.TP
+\fB-a\fP \fIIPaddress\fP
+IP address of the switch.
+.TP
+\fB-h\fP
+Print out a help message describing available options, then exit.
+.TP
+\fB-n\fP \fIplug\fP
+The plug number to power cycle.
+.TP
+\fB-p\fP \fIpassword\fP
+Password for login.
+.TP
+\fB-S\fP \fIpath\fR
+Full path to an executable to generate the password for login.
+.TP
+\fB-l\fP \fIusername\fP
+Username for login.
+.TP
+\fB-q\fP
+Quiet operation. Only print out error messages.
+.TP
+\fB-V\fP
+Print out a version message, then exit.
+
+.SH STDIN PARAMETERS
+.TP
+\fIagent = < param >\fR
+This option is used by fence_node(8) and is ignored by fence_rackswitch.
+.TP
+\fIipaddr = < ip >\fR
+IP address of the switch.
+.TP
+\fIusername = < param >\fR
+Username for login.
+.TP
+\fIpassword = < param >\fR
+Password for login.
+.TP
+\fIpasswd_script = < param >\fR
+Full path to an executable to generate the password for login.
+.TP
+\fIport = < param >\fR
+The port (outlet) number to act upon.
+
+.SH SEE ALSO
+fence(8), fence_node(8)
diff --git a/fence/agents/rsa/Makefile b/fence/agents/rsa/Makefile
index b385197..cfbf74b 100644
--- a/fence/agents/rsa/Makefile
+++ b/fence/agents/rsa/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_rsa
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/rsb/fence_rsb.8 b/fence/agents/rsb/fence_rsb.8
new file mode 100644
index 0000000..2bb7bf4
--- /dev/null
+++ b/fence/agents/rsb/fence_rsb.8
@@ -0,0 +1,75 @@
+.TH fence_rsb 8
+
+.SH NAME
+fence_rsb - I/O Fencing agent for Fujitsu-Siemens RSB
+
+.SH SYNOPSIS
+.B
+fence_rsb
+[\fIOPTION\fR]...
+
+.SH DESCRIPTION
+fence_rsb is an I/O Fencing agent which can be used with the Fujitsu-Siemens
+RSB management interface. It logs into an RSB device via telnet and reboots
+the associated machine. Lengthy telnet connections to the RSB device
+should be avoided while a GFS cluster is running because the connection
+will block any necessary fencing actions.
+
+fence_rsb accepts options on the command line as well as from stdin.
+Fenced sends parameters through stdin when it execs the agent. fence_rsb
+can be run by itself with command line options. This is useful for testing.
+
+.SH OPTIONS
+.TP
+\fB-a\fP \fIIPaddress\fR
+IP address or hostname of the RSB device.
+.TP
+\fB-h\fP
+Print out a help message describing available options, then exit.
+.TP
+\fB-l\fP \fIlogin\fR
+Login name.
+.TP
+\fB-n\fP \fItelnet_port\fR
+The port number on which the telnet service listens.
+.TP
+\fB-o\fP \fIaction\fR
+The action required. This can be reboot (default), off, on, or status.
+.TP
+\fB-p\fP \fIpassword\fR
+Password for login.
+.TP
+\fB-S\fP \fIpath\fR
+Full path to an executable to generate the password for login.
+.TP
+\fB-v\fP
+Verbose. Print informational messages to standard out.
+.TP
+\fB-V\fP
+Print out a version message, then exit.
+
+.SH STDIN PARAMETERS
+.TP
+\fIagent = < param >\fR
+This option is used by fence_node(8) and is ignored by fence_rsb.
+.TP
+\fIipaddr = < hostname | ip >\fR
+IP address or hostname of the device.
+.TP
+\fItelnet_port = < port number >\fR
+The port number on which the telnet service listens.
+.TP
+\fIlogin = < param >\fR
+Login name.
+.TP
+\fIoption = < param >\fR
+The action required. This can be reboot (default), off, on, or status.
+.TP
+\fIpasswd = < param >\fR
+Password for login.
+.TP
+\fIpasswd_script = < param >\fR
+Full path to an executable to generate the password for login.
+
+.SH SEE ALSO
+fence(8), fence_node(8)
diff --git a/fence/agents/sanbox2/Makefile b/fence/agents/sanbox2/Makefile
index bfc886f..19ec5db 100644
--- a/fence/agents/sanbox2/Makefile
+++ b/fence/agents/sanbox2/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_sanbox2
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/scsi/fence_scsi.8 b/fence/agents/scsi/fence_scsi.8
new file mode 100644
index 0000000..f1a29ea
--- /dev/null
+++ b/fence/agents/scsi/fence_scsi.8
@@ -0,0 +1,109 @@
+.TH fence_scsi 8
+
+.SH NAME
+fence_scsi - I/O fencing agent for SCSI persistent reservations
+
+.SH SYNOPSIS
+.B
+fence_scsi
+[\fIOPTION\fR]...
+
+.SH DESCRIPTION
+fence_scsi is an I/O fencing agent that uses SCSI-3 persistent
+reservations to control access to shared storage devices. These
+devices must support SCSI-3 persistent reservations (SPC-3 or greater)
+as well as the "preempt-and-abort" subcommand.
+
+The fence_scsi agent works by having each node in the cluster register
+a unique key with the SCSI devive(s). Once registered, a single node
+will become the reservation holder by creating a "write exclusive,
+registrants only" reservation on the device(s). The result is that
+only registered nodes may write to the device(s). When a node failure
+occurs, the fence_scsi agent will remove the key belonging to the
+failed node from the device(s). The failed node will no longer be able
+to write to the device(s). A manual reboot is required.
+
+Keys are either be specified manually (see -k option) or generated
+automatically (see -n option). Automatic key generation requires that
+cman be running. Keys will then be generated using the cluster ID and
+node ID such that each node has a unique key that can be determined by
+any other node in the cluster.
+
+Devices can either be specified manually (see -d option) or discovered
+automatically. Multiple devices can be specified manually by using a
+comma-separated list. If no devices are specified, the fence_scsi
+agent will attempt to discover devices by looking for cluster volumes
+and extracting the underlying devices. Devices may be device-mapper
+multipath devices or raw devices. If using a device-mapper multipath
+device, the fence_scsi agent will find the underlying devices (paths)
+and created registrations for each path.
+
+.SH OPTIONS
+.TP
+\fB-o\fP \fIaction\fR
+Fencing action. This value can be "on", "off", or "status". All
+actions require either a key (see -k option) or node name (see -n
+option). For "on", the agent will attempt to register with the
+device(s) and create a reservation if none exists. The "off" action
+will attempt to remove a node's key from the device(s). The "status"
+action will report whether or not a node's key is currently register
+with one or more of the devices. The default action if "off".
+.TP
+\fB-d\fP \fIdevices\fR
+List of devices to use for current operation. Devices can be
+comma-separated list of raw device (eg. /dev/sdc) or device-mapper
+multipath devices (eg. /dev/dm-3). Each device must support SCSI-3
+persistent reservations.
+.TP
+\fB-f\fP \fIlogfile\fR
+Log output to file.
+.TP
+\fB-n\fP \fInodename\fR
+Name of the node to be fenced. The node name is used to generate the
+key value used for the current operation. This option will be ignored
+when used with the -k option.
+.TP
+\fB-k\fP \fIkey\fR
+Key to use for the current operation. This key should be unique to a
+node. For the "on" action, the key specifies the key use to register
+the local node. For the "off" action, this key specifies the key to be
+removed from the device(s).
+.TP
+\fB-a\fP
+Use the APTPL flag for registrations. This option is only used for the
+"on" action.
+.TP
+\fB-h\fP
+Print out a help message describing available options, then exit.
+.TP
+\fB-v\fP
+Verbose output.
+.TP
+\fB-V\fP
+Print out a version message, then exit.
+
+.SH STDIN PARAMETERS
+.TP
+\fIagent = "param"\fR
+This option is used by fence_node(8) and is ignored by fence_scsi.
+.TP
+\fInodename = "param"\fR
+Same as -n option.
+.TP
+\fIaction = "param" \fR
+Same as -o option.
+.TP
+\fIdevices = "param"\fR
+Same as -d option.
+.TP
+\fIlogfile = "param"\fR
+Same as -f option
+.TP
+\fIkey = "param"\fR
+Same as -k option.
+.TP
+\fIaptpl = "1"
+Enable the APTPL flag. Default is 0 (disable).
+
+.SH SEE ALSO
+fence(8), fence_node(8), sg_persist(8), vgs(8), cman_tool(8), cman(5)
diff --git a/fence/agents/virsh/Makefile b/fence/agents/virsh/Makefile
index 190d080..51ef0ca 100644
--- a/fence/agents/virsh/Makefile
+++ b/fence/agents/virsh/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_virsh
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/vixel/fence_vixel.8 b/fence/agents/vixel/fence_vixel.8
new file mode 100644
index 0000000..dc285c5
--- /dev/null
+++ b/fence/agents/vixel/fence_vixel.8
@@ -0,0 +1,70 @@
+.TH fence_vixel 8
+
+.SH NAME
+fence_vixel - I/O Fencing agent for Vixel FC switches
+
+.SH SYNOPSIS
+.B
+fence_vixel
+[\fIOPTION\fR]...
+
+.SH DESCRIPTION
+fence_vixel is an I/O Fencing agent which can be used with Vixel FC switches.
+It logs into a Vixel switch via telnet and removes the specified port from the
+zone. Removing the zone access from the port disables the port from being able
+to access the storage.
+
+fence_vixel accepts options on the command line as well as from stdin.
+fenced sends parameters through stdin when it execs the agent. fence_vixel
+can be run by itself with command line options which is useful for testing.
+
+After a fence operation has taken place the fenced machine can no longer
+connect to the Vixel FC switch. When the fenced machine is ready to be brought
+back into the GFS cluster (after reboot) the port on the Vixel FC switch needs
+to be enabled. In order to do this, log into the Vixel FC switch. Then go to:
+
+config->zones->config <port> <comma-separated-list-of-ports-in-the-zone>
+
+Then apply
+
+Consult the Vixel manual for details
+
+.SH OPTIONS
+.TP
+\fB-a\fP \fIIPaddress\fP
+IP address of the switch.
+.TP
+\fB-h\fP
+Print out a help message describing available options, then exit.
+.TP
+\fB-n\fP \fIport\fP
+The port number to remove zoning from on the switch.
+.TP
+\fB-p\fP \fIpassword\fP
+Password for login.
+.TP
+\fB-S\fP \fIpath\fR
+Full path to an executable to generate the password for login.
+.TP
+\fB-V\fP
+Print out a version message, then exit.
+
+.SH STDIN PARAMETERS
+.TP
+\fIagent = < param >\fR
+This option is used by fence_node(8) and is ignored by fence_vixel.
+.TP
+\fIipaddr = < hostname | ip >\fR
+IP address or hostname of the switch.
+.TP
+\fIpasswd = < param >\fR
+Password for login.
+.TP
+\fIpasswd_script = < param >\fR
+Full path to an executable to generate the password for login.
+.TP
+\fIport = < param >\fR
+The port number to remove zoning from on the switch.
+
+.SH SEE ALSO
+fence(8), fence_node(8)
diff --git a/fence/agents/vmware/Makefile b/fence/agents/vmware/Makefile
index 0ec0b3d..e58aa67 100644
--- a/fence/agents/vmware/Makefile
+++ b/fence/agents/vmware/Makefile
@@ -3,5 +3,6 @@ include ../../../make/defines.mk
TARGET= fence_vmware_helper fence_vmware
MANTARGET= fence_vmware.8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/wti/Makefile b/fence/agents/wti/Makefile
index 5240559..c281149 100644
--- a/fence/agents/wti/Makefile
+++ b/fence/agents/wti/Makefile
@@ -2,6 +2,6 @@ include ../../../make/defines.mk
TARGET= fence_wti
-MANTARGET= $(TARGET).8
+MAKEMAN = 1
include $(OBJDIR)/make/fencebuild.mk
diff --git a/fence/agents/xcat/fence_xcat.8 b/fence/agents/xcat/fence_xcat.8
new file mode 100644
index 0000000..7da35d5
--- /dev/null
+++ b/fence/agents/xcat/fence_xcat.8
@@ -0,0 +1,61 @@
+.TH fence_xcat 8
+
+.SH NAME
+fence_xcat - I/O Fencing agent for xcat environments
+
+.SH SYNOPSIS
+.B
+fence_xcat
+[\fIOPTION\fR]...
+
+.SH DESCRIPTION
+fence_xcat is a wrapper to the rpower(1) command that is distributed
+with the xCAT project available at http://www.xcat.org. Use of
+fence_xcat requires that xcat has already been properly configured
+for your environment. Refer to xCAT(1) for more information on
+configuring xCAT.
+
+fence_xcat accepts options on the command line as well as from stdin.
+fenced sends parameters through stdin when it execs the agent. fence_xcat
+can be run by itself with command line options which is useful for testing.
+
+NOTE: It is recommended that fence_bladecenter(8) is used instead of fence_xcat if
+the bladecenter firmware supports telnet. This interface is much cleaner and
+easier to setup.
+
+.SH OPTIONS
+.TP
+\fB-h\fP
+Print out a help message describing available options, then exit.
+.TP
+\fB-n\fP \fInodename\fP
+The nodename as defined in nodelist.tab of the xCAT setup.
+.TP
+\fB-o\fP \fIaction\fP
+The action required. on, off, reset (default) or stat.
+.TP
+\fB-r\fP \fIrpower\fP
+The path to the rpower binary.
+.TP
+\fB-q\fP
+Quiet mode: print only error messages.
+.TP
+\fB-V\fP
+Print out a version message, then exit.
+
+.SH STDIN PARAMETERS
+.TP
+\fIagent = < param >\fR
+This option is used by fence_node(8) and is ignored by fence_xcat.
+.TP
+\fInodename = < param >\fR
+The nodename as defined in nodelist.tab of the xCAT setup.
+.TP
+\fIaction = < param >\fR
+The action required. on, off, reset (default) or stat.
+.TP
+\fIrpower = < param >\fR
+The path to the rpower binary.
+
+.SH SEE ALSO
+fence(8), fence_node(8), fence_bladecenter(8), nodelist.tab(8), rpower(1), xCAT(1)
diff --git a/fence/agents/xvm/Makefile b/fence/agents/xvm/Makefile
index 5b10360..1ff9e3e 100644
--- a/fence/agents/xvm/Makefile
+++ b/fence/agents/xvm/Makefile
@@ -1,6 +1,8 @@
TARGET1= fence_xvmd
TARGET2= testprog
+MANTARGET=$(TARGET1).8
+
SBINDIRT=$(TARGET1)
all: ${TARGET1}
diff --git a/fence/agents/xvm/fence_xvmd.8 b/fence/agents/xvm/fence_xvmd.8
new file mode 100644
index 0000000..23e7c6e
--- /dev/null
+++ b/fence/agents/xvm/fence_xvmd.8
@@ -0,0 +1,124 @@
+.TH fence_xvmd 8
+
+.SH NAME
+fence_xvmd - Libvirt-based, general purpose fencing host for virtual machines.
+
+.SH SYNOPSIS
+.B
+fence_xvmd
+[\fIOPTION\fR]...
+
+.SH DESCRIPTION
+fence_xvmd is an I/O Fencing host which resides on bare metal machines
+and is used in conjunction with the fence_xvm fencing agent. Together,
+these two programs can be used to fence can be used
+machines which are part of a cluster.
+
+If the virtual machines are backed by clustered storage or the virtual
+machines may be migrated to other physical machines, all physical
+machines in question must also be a part of their own CMAN/OpenAIS based
+cluster. Furthermore, the bare metal cluster is required to have
+fencing configured if virtual machine recovery is expected to be automatic.
+
+fence_xvmd accepts options on the command line and from cluster.conf
+
+.SH OPTIONS
+.TP
+\fB-f\fP
+Foreground mode (do not fork)
+.TP
+\fB-d\fP
+Enable debugging output. The more times you specify this parameter,
+the more debugging output you will receive.
+.TP
+\fB-i\fP \fIfamily\fP
+IP family to use (auto, ipv4, or ipv6; default = auto)
+.TP
+\fB-a\fP \fIaddress\fP
+Multicast address to listen on (default=225.0.0.12 for ipv4, ff02::3:1
+for ipv6)
+.TP
+\fB-p\fP \fIport\fP
+Port to use (default=1229)
+.TP
+\fB-I\fP \fIinterface\fP
+Network interface to listen on, e.g. eth0.
+.TP
+\fB-C\fP \fIauth\fP
+Authentication type (none, sha1, sha256, sha512; default=sha256). This
+controls the authentication mechanism used to authenticate clients. The
+three SHA hashes use a key which must be shared between both the virtual
+machines and the host machine or cluster. The three SHA authentication
+mechanisms use a simple bidirectional challenge-response based on pseudo-
+random number generation and a shared private key.
+.TP
+\fB-c\fP \fIhash\fP
+Packet hash type (none, sha1, sha256, sha512; default=sha256). This
+controls the hashing mechanism used to authenticate fencing requests. The
+three SHA hashes use a key which must be shared between both the virtual
+machines and the host machine or cluster.
+.TP
+\fB-k\fP \fIkey_file\fP
+Use the specified key file for packet hashing / SHA authentication.
+When both the hash type and the authentication type are set to "none",
+this parameter is ignored.
+.TP
+\fB-u\fP
+Fence by UUID instead of virtual machine name.
+.TP
+\fB-?\fP
+Print out a help message describing available options, then exit.
+.TP
+\fB-h\fP
+Print out a help message describing available options, then exit.
+.TP
+\fB-X\fP
+Do not connect to CCS for configuration; only use command line
+parameters. CCS configuration parameters override command line
+parameters (because they are cluster-wide), so if you need to
+override a configuration option contained in CCS, you must specify
+this parameter.
+.TP
+\fB-L\fP
+Local-only / non-cluster mode. When used with -X, this this option
+prevents fence_xvmd from operating as a clustered service, obviating
+the need to configure/run CMAN on the host domain.
+.TP
+\fB-U\fP \fIuri\fP
+Force use of the specified URI for connecting to the hypervisor.
+.TP
+\fB-V\fP
+Print out a version message, then exit.
+
+.SH CCS PARAMETERS
+CCS options are simply attributes of the <fence_xvmd> tag, a
+child of the <cluster> tag in /etc/cluster/cluster.conf.
+.TP
+\fIdebug="1"\fR
+Same as the -d option. Specify numbers >1 for more debugging information.
+.TP
+\fIfamily="param"\fR
+Same as the -i option.
+.TP
+\fImulticast_address="param"\fR
+Same as the -a option.
+.TP
+\fIport="param"\fR
+Same as the -p option.
+.TP
+\fIauth="param"\fR
+Same as the -C option.
+.TP
+\fIhash="param"\fR
+Same as the -c option.
+.TP
+\fIkey_file="param"\fR
+Same as the -k option.
+.TP
+\fIuse_uuid="1"\fR
+Same as the -u option.
+.TP
+
+
+.SH SEE ALSO
+fence(8), fence_node(8), fence_xvm(8)
diff --git a/fence/agents/zvm/fence_zvm.8 b/fence/agents/zvm/fence_zvm.8
new file mode 100644
index 0000000..b22f8e1
--- /dev/null
+++ b/fence/agents/zvm/fence_zvm.8
@@ -0,0 +1,62 @@
+.TH fence_zvm 8
+
+.SH NAME
+fence_zvm - I/O Fencing agent for GFS on s390 and zSeries VM clusters
+
+.SH SYNOPSIS
+.B
+fence_zvm
+[\fIOPTION\fR]...
+
+.SH DESCRIPTION
+fence_zvm is an I/O Fencing agent used on a GFS virtual machine in a s390 or zSeries VM cluster.
+It uses the s3270 program to log the specified virtual machine out of VM.
+For fence_zvm to execute correctly, you must have s3270 in your PATH.
+
+fence_zvm accepts options on the command line as well as from stdin.
+fence_node sends the options through stdin when it execs the agent.
+fence_zvm can be run by itself with command line options which is useful
+for testing.
+
+.SH OPTIONS
+.TP
+\fB-a\fP \fIIPaddress\fP
+IP address or hostname of the Physical machine (required).
+.TP
+\fB-h\fP
+Print out a help message describing available options, then exit.
+.TP
+\fB-u\fP \fIuserid\fP
+userid of the virtual machine to fence (required).
+.TP
+\fB-p\fP \fIpassword\fP
+password of the virtual machine to fence (required).
+.TP
+\fB-S\fP \fIpath\fR
+Full path to an executable to generate the password of the virtual machine to fence.
+.TP
+\fB-q\fP
+quiet mode, no output.
+.TP
+\fB-V\fP
+Print out a version message, then exit.
+
+.SH STDIN PARAMETERS
+.TP
+\fIagent = < param >\fP
+This option is used by fence_node(8) and is ignored by fence_zvm.
+.TP
+\fIipaddr = < hostname | ip >\fP
+IP address or hostname of the Physical machine (required).
+.TP
+\fIpasswd = < param >\fP
+password of the virtual machine to fence (required).
+.TP
+\fIpasswd_script = < param >\fR
+Full path to an executable to generate the password of the virtual machine to fence.
+.TP
+\fIuserid = < param >\fP
+userid of the virtual machine to fence (required).
+
+.SH SEE ALSO
+fence(8), fenced(8), fence_node(8)
diff --git a/fence/man/Makefile b/fence/man/Makefile
index 45401f6..a4a9cf1 100644
--- a/fence/man/Makefile
+++ b/fence/man/Makefile
@@ -2,26 +2,6 @@ include ../../make/defines.mk
MANTARGET = fenced.8 fence_node.8 fence_tool.8
-ifdef fence_agents
-MANTARGET += \
- fence_ack_manual.8 \
- fence_baytech.8 \
- fence_brocade.8 \
- fence_bullpap.8 \
- fence_cpint.8 \
- fence_drac.8 \
- fence_egenera.8 \
- fence_mcdata.8 \
- fence_rackswitch.8 \
- fence_rib.8 \
- fence_rsb.8 \
- fence_scsi.8 \
- fence_vixel.8 \
- fence_xcat.8 \
- fence_xvmd.8 \
- fence_zvm.8
-endif
-
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
diff --git a/fence/man/fence_ack_manual.8 b/fence/man/fence_ack_manual.8
deleted file mode 100644
index 6b4cd14..0000000
--- a/fence/man/fence_ack_manual.8
+++ /dev/null
@@ -1,39 +0,0 @@
-.TH FENCE_ACK_MANUAL 8 2009-12-21 cluster cluster
-
-.SH NAME
-fence_ack_manual \- a program to override fenced fencing operations
-
-.SH SYNOPSIS
-.B fence_ack_manual
-[OPTIONS]
-.I nodename
-
-.SH DESCRIPTION
-When
-.BR fenced (8)
-fails to fence a node, it retries indefinately.
-.BR fence_ack_manual (8)
-tells fenced to stop retrying and consider the node fenced.
-
-.P
-It is important that this only be done after the node has been manually
-turned off or prevented from writing to shared storage.
-Without this manual action and verification, the storage that fencing
-protects may become corrupted.
-
-.P
-When fenced fences a node that has no fence devices defined in the cluster
-configuration, the fencing operation fails. This failure will be repeated
-indefinately until fence_ack_manual is run by an operator to indicate
-the node is in a safe state to proceed.
-(Defining no fencing devices for node is the equivalent of using the
-fence_manual agent in previous versions.)
-
-.SH OPTIONS
-.TP
-.B \-h
-Print a help message describing available options, then exit.
-
-.SH SEE ALSO
-.BR fenced (8)
-
diff --git a/fence/man/fence_baytech.8 b/fence/man/fence_baytech.8
deleted file mode 100644
index e60175d..0000000
--- a/fence/man/fence_baytech.8
+++ /dev/null
@@ -1,82 +0,0 @@
-.TH fence_baytech 8
-
-.SH NAME
-fence_baytech - I/O Fencing agent for Baytech RPC switches in combination with a Cyclades Terminal Server
-
-.SH SYNOPSIS
-.B
-fence_baytech
-[\fIOPTION\fR]...
-
-.SH DESCRIPTION
-
-This fencing agent is written for the Baytech RPC27-20nc in combination with
-a Cyclades terminal server. The Cyclades TS exports the RPC's serial port
-via a Telnet interface. Other interfaces, such as SSH, are possible.
-However, this script relies upon the assumption that Telnet is used. Future
-features to this agent would allow the agent to work with a multitude of
-different communication protocols such as Telnet, SSH or Kermit.
-
-The other assumption that is made is that Outlet names do not end in space.
-The name "Foo" and "Foo " are identical when the RPC prints them with
-the status command.
-
-fence_baytech accepts options on the command line as well as from stdin.
-fenced sends parameters through stdin when it execs the agent. fence_baytech
-can be run by itself with command line options which is useful for testing.
-
-.SH OPTIONS
-.TP
-\fB-a\fP \fIhost\fP
-IP address or hostname to connect to.
-.TP
-\fB-h\fP
-Print out a help message describing available options, then exit.
-.TP
-\fB-l\fP \fIlogin\fP
-Username name for the switch.
-.TP
-\fB-n\fP \fIport\fP
-The name of the outlet to act upon.
-.TP
-\fB-o\fP \fIaction\fP
-The action required. This can be on, off, status or reboot (default)
-.TP
-\fB-p\fP \fIpassword\fP
-Password for login.
-.TP
-\fB-S\fP \fIpath\fR
-Full path to an executable to generate the password for login.
-.TP
-\fB-q\fP
-Quiet mode: print only error messages.
-.TP
-\fB-V\fP
-Print out a version message, then exit.
-
-.SH STDIN PARAMETERS
-
-.TP
-\fIagent = < param >\fR
-This option is used by fence_node(8) and is ignored by fence_baytech.
-.TP
-\fIhost = < hostname | ip >\fR
-IP address or hostname to connect to.
-.TP
-\fIlogin = < param >\fR
-Login name.
-.TP
-\fIaction = < param >\fR
-The action required. This can be on, off, status or reboot (default)
-.TP
-\fIpasswd = < param >\fR
-Password for login.
-.TP
-\fIpasswd_script = < param >\fR
-Full path to an executable to generate the password for login.
-.TP
-\fIoutlet = < param >\fR
-The name of the outlet to act upon.
-
-.SH SEE ALSO
-fence(8), fence_node(8)
diff --git a/fence/man/fence_brocade.8 b/fence/man/fence_brocade.8
deleted file mode 100644
index 36fde82..0000000
--- a/fence/man/fence_brocade.8
+++ /dev/null
@@ -1,82 +0,0 @@
-.TH fence_brocade 8
-
-.SH NAME
-fence_brocade - I/O Fencing agent for Brocade FC switches
-
-.SH SYNOPSIS
-.B
-fence_brocade
-[\fIOPTION\fR]...
-
-.SH DESCRIPTION
-fence_brocade is an I/O Fencing agent which can be used with Brocade FC
-switches. It logs into a Brocade switch via telnet and disables a specified
-port. Disabling the port which a machine is connected to effectively fences
-that machine. Lengthy telnet connections to the switch should be avoided
-while a GFS cluster is running because the connection will block any necessary
-fencing actions.
-
-fence_brocade accepts options on the command line as well as from stdin.
-fenced sends parameters through stdin when it execs the agent. fence_brocade
-can be run by itself with command line options which is useful for testing.
-
-After a fence operation has taken place the fenced machine can no longer connect
-to the Brocade FC switch. When the fenced machine is ready to be brought back
-into the GFS cluster (after reboot) the port on the Brocade FC switch needs to
-be enabled. This can be done by running fence_brocade and specifying the
-enable action.
-
-.SH OPTIONS
-.TP
-\fB-a\fP \fIIPaddress\fP
-IP address of the switch.
-.TP
-\fB-h\fP
-Print out a help message describing available options, then exit.
-.TP
-\fB-l\fP \fIlogin\fP
-Login name for the switch.
-.TP
-\fB-n\fP \fIport\fP
-The port number to disable on the switch.
-.TP
-\fB-o\fP \fIaction\fP
-The action required. disable (default) or enable.
-.TP
-\fB-p\fP \fIpassword\fP
-Password for login.
-.TP
-\fB-S\fP \fIpath\fR
-Full path to an executable to generate the password for login.
-.TP
-\fB-q\fP
-Quiet mode: print only error messages.
-.TP
-\fB-V\fP
-Print out a version message, then exit.
-
-.SH STDIN PARAMETERS
-.TP
-\fIagent = < param >\fR
-This option is used by fence_node(8) and is ignored by fence_brocade.
-.TP
-\fIipaddr = < hostname | ip >\fR
-IP address or hostname of the switch.
-.TP
-\fIlogin = < param >\fR
-Login name.
-.TP
-\fIoption = < param >\fR
-The action required. disable (default) or enable.
-.TP
-\fIpasswd = < param >\fR
-Password for login.
-.TP
-\fIpasswd_script = < param >\fR
-Full path to an executable to generate the password for login.
-.TP
-\fIport = < param >\fR
-The port number to disable on the switch.
-
-.SH SEE ALSO
-fence(8), fence_node(8)
diff --git a/fence/man/fence_bullpap.8 b/fence/man/fence_bullpap.8
deleted file mode 100644
index 876b406..0000000
--- a/fence/man/fence_bullpap.8
+++ /dev/null
@@ -1,71 +0,0 @@
-.TH fence_bullpap 8
-
-.SH NAME
-fence_bullpap - I/O Fencing agent for Bull FAME architecture controlled by a
-PAP management console.
-
-.SH SYNOPSIS
-.B
-fence_bullpap
-[\fIOPTION\fR]...
-
-.SH DESCRIPTION
-fence_bullpap is an I/O Fencing agent which can be used with Bull's NovaScale
-machines controlled by PAP management consoles. This agent calls Bull's
-support software provided by the NSMasterHW RPM available from Bull.
-
-fence_bullpap accepts options on the command line as well as from stdin.
-fenced sends the options through stdin when it execs the agent. fence_bullpap
-can be run by itself with command line options which is useful for testing.
-
-.SH OPTIONS
-.TP
-\fB-a\fP \fIIPaddress\fP
-IP address or hostname of the PAP management console.
-.TP
-\fB-h\fP
-Print out a help message describing available options, then exit.
-.TP
-\fB-l\fP \fIlogin\fP
-Login with administrative privileges.
-.TP
-\fB-d\fP \fIdomain\fP
-This is the domain name of the Bull machine to power-cycle.
-.TP
-\fB-o\fP \fIoption\fP
-Action to perform (on, off, reboot, status).
-.TP
-\fB-p\fP \fIpassword\fP
-Password for login.
-.TP
-\fB-S\fP \fIpath\fR
-Full path to an executable to generate the password for login.
-.TP
-\fB-q\fP
-Quiet operation. Only print out error messages.
-.TP
-\fB-V\fP
-Print out a version message, then exit.
-
-.SH STDIN PARAMETERS
-.TP
-\fIipaddr = < hostname | ip >\fR
-IP address or hostname of the PAP management console.
-.TP
-\fIlogin= < param >\fR
-Login with administrative privileges.
-.TP
-\fIdomain = < param >\fR
-This is the domain name of the Bull machine to power-cycle.
-.TP
-\fIoption = < param >\fR
-Action to perform (on, off, reboot, status).
-.TP
-\fIpasswd = < param >\fR
-Password for login.
-.TP
-\fIpasswd_script = < param >\fR
-Full path to an executable to generate the password for login.
-
-.SH SEE ALSO
-fence(8), fence_node(8)
diff --git a/fence/man/fence_cpint.8 b/fence/man/fence_cpint.8
deleted file mode 100644
index efbaa7e..0000000
--- a/fence/man/fence_cpint.8
+++ /dev/null
@@ -1,52 +0,0 @@
-.TH fence_cpint 8
-
-.SH NAME
-fence_cpint - I/O Fencing agent for GFS on s390 and zSeries VM clusters
-
-.SH SYNOPSIS
-.B
-fence_cpint
-[\fIOPTION\fR]...
-
-.SH DESCRIPTION
-fence_cpint is an I/O Fencing agent used on a virtual machine running GFS in a
-s390 or zSeries VM cluster.
-It uses the cpint package to send a CP LOGOFF command to the specified virtual
-machine.
-For fence_cpint to execute correctly, you must have the cpint module installed,
-and hcp in your PATH.
-\fBNOTE:\fP for fence_cpint to send a command to another virtual machine, the
-machine executing it must either be a privilege class C user or it must be
-the secondary user of the virtual machine to be fenced. This means that unless
-all of you GULM server nodes are privilege class C, fence_cpint can only be
-used with SLM.
-
-fence_cpint accepts options on the command line as well as from stdin.
-fence_node sends the options through stdin when it execs the agent.
-fence_cpint can be run by itself with command line options which is useful for
-testing.
-
-.SH OPTIONS
-.TP
-\fB-h\fP
-Print out a help message describing available options, then exit.
-.TP
-\fB-u\fP \fIuserid\fP
-userid of the virtual machine to fence (required).
-.TP
-\fB-q\fP
-quiet mode, no output.
-.TP
-\fB-V\fP
-Print out a version message, then exit.
-
-.SH STDIN PARAMETERS
-.TP
-\fIagent = < param >\fR
-This option is used by fence_node(8) and is ignored by fence_cpint.
-.TP
-\fIuserid = < parm >\fP
-userid of the virtual machine to fence (required).
-
-.SH SEE ALSO
-fence(8), fence_node(8)
diff --git a/fence/man/fence_drac.8 b/fence/man/fence_drac.8
deleted file mode 100644
index 8dda184..0000000
--- a/fence/man/fence_drac.8
+++ /dev/null
@@ -1,97 +0,0 @@
-.TH fence_drac 8
-
-.SH NAME
-fence_drac - fencing agent for Dell Remote Access Card
-
-.SH SYNOPSIS
-.B
-fence_drac
-[\fIOPTION\fR]...
-
-.SH DESCRIPTION
-fence_drac is an I/O Fencing agent which can be used with the Dell Remote
-Access Card (DRAC). This card provides remote access to controlling
-power to a server. It logs into the DRAC through the telnet interface of
-the card. By default, the telnet interface is not enabled. To enable the
-interface, you will need to use the racadm command in the racser-devel rpm
-available from Dell. To enable telnet on the DRAC:
-
-[root]# racadm config -g cfgSerial -o cfgSerialTelnetEnable 1
-
-[root]# racadm racreset
-
-fence_drac accepts options on the command line as well as from stdin.
-Fenced sends parameters through stdin when it execs the agent. fence_drac
-can be run by itself with command line options. This is useful for testing
-and for turning outlets on or off from scripts.
-
-.SH OPTIONS
-.TP
-\fB-a\fP \fIIPaddress\fR
-IP address or hostname of the switch.
-.TP
-\fB-c\fP \fIcmd_prompt\fR
-Force fence_drac to use cmd_prompt as the command prompt
-.TP
-\fB-d\fP \fIdracversion\fR
-Force fence_drac to treat the device as though it was for the specified drac version
-.TP
-\fB-D\fP \fIdumpfile\fR
-Debug file of the telnet interaction
-.TP
-\fB-h\fP
-Print out a help message describing available options, then exit.
-.TP
-\fB-l\fP \fIlogin\fR
-Login name.
-.TP
-\fB-m\fP \fImodulename\fR
-The module name of the blade when using DRAC/MC firmware.
-.TP
-\fB-o\fP \fIaction\fR
-The action required. reboot (default), off, on or status.
-.TP
-\fB-p\fP \fIpassword\fR
-Password for login.
-.TP
-\fB-S\fP \fIpath\fR
-Full path to an executable to generate the password for login.
-.TP
-\fB-V\fP
-Print out a version message, then exit.
-
-.SH STDIN PARAMETERS
-.TP
-\fIaction = < param >\fR
-The action required. reboot (default), off, on or status.
-.TP
-\fIagent = < param >\fR
-This option is used by fence_node(8) and is ignored by fence_apc.
-.TP
-\fIcmd_prompt = < param >\fr
-Force fence_drac to use cmd_prompt as the command prompt
-.TP
-\fIdrac_version = < param >\fr
-Force fence_drac to treat the device as though it was for the specified drac version.
-.TP
-\fIdebug = < dumpfile >\fR
-Debug file of the telnet interaction
-.TP
-\fIipaddr = < hostname | ip >\fR
-IP address or hostname of the switch.
-.TP
-\fIlogin = < param >\fR
-Login name.
-.TP
-\fImodulename = < param >\fr
-The module name of the blade when using DRAC/MC firmware.
-.TP
-\fIpasswd = < param >\fR
-Password for login.
-.TP
-\fIpasswd_script = < param >\fR
-Full path to an executable to generate the password for login.
-.TP
-
-.SH SEE ALSO
-fence(8), fence_node(8)
diff --git a/fence/man/fence_egenera.8 b/fence/man/fence_egenera.8
deleted file mode 100644
index cfa839e..0000000
--- a/fence/man/fence_egenera.8
+++ /dev/null
@@ -1,70 +0,0 @@
-.TH fence_egenera 8
-
-.SH NAME
-fence_egenera - I/O Fencing agent for the Egenera BladeFrame
-
-.SH SYNOPSIS
-.B
-fence_egenera
-[\fIOPTION\fR]...
-
-.SH DESCRIPTION
-fence_egenera is an I/O Fencing agent which can be used with the Egenera
-BladeFrame. It logs into a control blade (cserver) via ssh and operates
-on a processing blade (pserver) identified by the pserver name and the
-logical process area network (LPAN) that it is in. fence_egenera requires
-that ssh keys have been setup so that the fence_egenera does not require
-a password to authenticate. Refer to ssh(8) for more information on setting
-up ssh keys.
-
-fence_egenera accepts options on the command line as well as from stdin.
-Fenced sends parameters through stdin when it execs the agent. fence_egenera
-can also be run by itself with command line options.
-
-.SH OPTIONS
-.TP
-\fB-c\fP \fIcserver\fR
-The cserver to ssh to. cserver can be in the form user@hostname to
-specify a different user to login as.
-.TP
-\fB-h\fP
-Print out a help message describing available options, then exit.
-.TP
-\fB-l\fP \fIlpan\fR
-the lpan to operate on
-.TP
-\fB-o\fP \fIaction\fR
-The action required. reboot (default), off, on or status.
-.TP
-\fB-p\fP \fIpserver\fR
-the pserver to operate on
-.TP
-\fB-q\fP
-quite mode. suppress output.
-.TP
-\fB-V\fP
-Print out a version message, then exit.
-
-.SH STDIN PARAMETERS
-.TP
-\fIaction = < param >\fR
-The action required. reboot (default), off, on or status.
-.TP
-\fIagent = < param >\fR
-This option is used by fence_node(8) and is ignored by fence_apc.
-.TP
-\fIcserver = < param >\fR
-The cserver to ssh to. cserver can be in the form user@hostname to
-specify a different user to login as.
-.TP
-\fIlpan = < param >\fR
-The lpan to operate on
-.TP
-\fIpserver = < param >\fR
-The pserver to operate on
-.TP
-\fIesh = < param >\fR
-The path to the esh command on the cserver (default is /opt/panmgr/bin/esh)
-
-.SH SEE ALSO
-fence(8), fence_node(8), ssh(8)
diff --git a/fence/man/fence_mcdata.8 b/fence/man/fence_mcdata.8
deleted file mode 100644
index 2230a66..0000000
--- a/fence/man/fence_mcdata.8
+++ /dev/null
@@ -1,82 +0,0 @@
-.TH fence_mcdata 8
-
-.SH NAME
-fence_mcdata - I/O Fencing agent for McData FC switches
-
-.SH SYNOPSIS
-.B
-fence_mcdata
-[\fIOPTION\fR]...
-
-.SH DESCRIPTION
-fence_mcdata is an I/O Fencing agent which can be used with McData FC
-switches. It logs into a McData switch via telnet and disables a specified
-port. Disabling the port which a machine is connected to effectively fences
-that machine. Lengthy telnet connections to the switch should be avoided
-while a GFS cluster is running because the connection will block any necessary
-fencing actions.
-
-fence_mcdata accepts options on the command line as well as from stdin.
-fenced sends parameters through stdin when it execs the agent. fence_mcdata
-can be run by itself with command line options which is useful for testing.
-
-After a fence operation has taken place the fenced machine can no longer connect
-to the McData FC switch. When the fenced machine is ready to be brought back
-into the GFS cluster (after reboot) the port on the McData FC switch needs to
-be enabled. This can be done by running fence_mcdata and specifying the
-enable action.
-
-.SH OPTIONS
-.TP
-\fB-a\fP \fIIPaddress\fP
-IP address of the switch.
-.TP
-\fB-h\fP
-Print out a help message describing available options, then exit.
-.TP
-\fB-l\fP \fIlogin\fP
-Username name for the switch.
-.TP
-\fB-n\fP \fIport\fP
-The port number to disable on the switch.
-.TP
-\fB-o\fP \fIaction\fP
-The action required. disable (default) or enable.
-.TP
-\fB-p\fP \fIpassword\fP
-Password for login.
-.TP
-\fB-S\fP \fIpath\fR
-Full path to an executable to generate the password for login.
-.TP
-\fB-q\fP
-Quiet mode: print only error messages.
-.TP
-\fB-V\fP
-Print out a version message, then exit.
-
-.SH STDIN PARAMETERS
-.TP
-\fIagent = < param >\fR
-This option is used by fence_node(8) and is ignored by fence_mcdata.
-.TP
-\fIipaddr = < hostname | ip >\fR
-IP address or hostname of the switch.
-.TP
-\fIlogin = < param >\fR
-Login name.
-.TP
-\fIoption = < param >\fR
-The action required. disable (default) or enable.
-.TP
-\fIpasswd = < param >\fR
-Password for login.
-.TP
-\fIpasswd_script = < param >\fR
-Full path to an executable to generate the password for login.
-.TP
-\fIport = < param >\fR
-The port number to disable on the switch.
-
-.SH SEE ALSO
-fence(8), fence_node(8)
diff --git a/fence/man/fence_rackswitch.8 b/fence/man/fence_rackswitch.8
deleted file mode 100644
index 4f662c7..0000000
--- a/fence/man/fence_rackswitch.8
+++ /dev/null
@@ -1,68 +0,0 @@
-.TH fence_rackswitch 8
-
-.SH NAME
-fence_rackswitch - I/O Fencing agent for RackSaver RackSwitch
-
-.SH SYNOPSIS
-.B
-fence_rackswitch
-[\fIOPTION\fR]...
-
-.SH DESCRIPTION
-fence_rackswitch is an I/O Fencing agent which can be used with the RackSaver
-RackSwitch. It logs into the RackSwitch and boots a specified plug.
-Using the http interface to the RackSwitch should be avoided while a GFS cluster is
-running because the connection may interfere with the operation of this agent.
-
-fence_rackswitch accepts options on the command line as well as from stdin.
-fenced sends the options through stdin when it execs the agent. fence_rackswitch
-can be run by itself with command line options which is useful for testing.
-
-.SH OPTIONS
-.TP
-\fB-a\fP \fIIPaddress\fP
-IP address of the switch.
-.TP
-\fB-h\fP
-Print out a help message describing available options, then exit.
-.TP
-\fB-n\fP \fIplug\fP
-The plug number to power cycle.
-.TP
-\fB-p\fP \fIpassword\fP
-Password for login.
-.TP
-\fB-S\fP \fIpath\fR
-Full path to an executable to generate the password for login.
-.TP
-\fB-l\fP \fIusername\fP
-Username for login.
-.TP
-\fB-q\fP
-Quiet operation. Only print out error messages.
-.TP
-\fB-V\fP
-Print out a version message, then exit.
-
-.SH STDIN PARAMETERS
-.TP
-\fIagent = < param >\fR
-This option is used by fence_node(8) and is ignored by fence_rackswitch.
-.TP
-\fIipaddr = < ip >\fR
-IP address of the switch.
-.TP
-\fIusername = < param >\fR
-Username for login.
-.TP
-\fIpassword = < param >\fR
-Password for login.
-.TP
-\fIpasswd_script = < param >\fR
-Full path to an executable to generate the password for login.
-.TP
-\fIport = < param >\fR
-The port (outlet) number to act upon.
-
-.SH SEE ALSO
-fence(8), fence_node(8)
diff --git a/fence/man/fence_rib.8 b/fence/man/fence_rib.8
deleted file mode 100644
index 04ace3f..0000000
--- a/fence/man/fence_rib.8
+++ /dev/null
@@ -1,10 +0,0 @@
-.TH fence_rib 8
-
-.SH NAME
-fence_rib - I/O Fencing agent for Compaq Remote Insight Lights Out card
-
-.SH DESCRIPTION
-fence_rib is deprecated. fence_ilo should be used instead
-
-.SH SEE ALSO
-fence_ilo(8)
diff --git a/fence/man/fence_rsb.8 b/fence/man/fence_rsb.8
deleted file mode 100644
index 2bb7bf4..0000000
--- a/fence/man/fence_rsb.8
+++ /dev/null
@@ -1,75 +0,0 @@
-.TH fence_rsb 8
-
-.SH NAME
-fence_rsb - I/O Fencing agent for Fujitsu-Siemens RSB
-
-.SH SYNOPSIS
-.B
-fence_rsb
-[\fIOPTION\fR]...
-
-.SH DESCRIPTION
-fence_rsb is an I/O Fencing agent which can be used with the Fujitsu-Siemens
-RSB management interface. It logs into an RSB device via telnet and reboots
-the associated machine. Lengthy telnet connections to the RSB device
-should be avoided while a GFS cluster is running because the connection
-will block any necessary fencing actions.
-
-fence_rsb accepts options on the command line as well as from stdin.
-Fenced sends parameters through stdin when it execs the agent. fence_rsb
-can be run by itself with command line options. This is useful for testing.
-
-.SH OPTIONS
-.TP
-\fB-a\fP \fIIPaddress\fR
-IP address or hostname of the RSB device.
-.TP
-\fB-h\fP
-Print out a help message describing available options, then exit.
-.TP
-\fB-l\fP \fIlogin\fR
-Login name.
-.TP
-\fB-n\fP \fItelnet_port\fR
-The port number on which the telnet service listens.
-.TP
-\fB-o\fP \fIaction\fR
-The action required. This can be reboot (default), off, on, or status.
-.TP
-\fB-p\fP \fIpassword\fR
-Password for login.
-.TP
-\fB-S\fP \fIpath\fR
-Full path to an executable to generate the password for login.
-.TP
-\fB-v\fP
-Verbose. Print informational messages to standard out.
-.TP
-\fB-V\fP
-Print out a version message, then exit.
-
-.SH STDIN PARAMETERS
-.TP
-\fIagent = < param >\fR
-This option is used by fence_node(8) and is ignored by fence_rsb.
-.TP
-\fIipaddr = < hostname | ip >\fR
-IP address or hostname of the device.
-.TP
-\fItelnet_port = < port number >\fR
-The port number on which the telnet service listens.
-.TP
-\fIlogin = < param >\fR
-Login name.
-.TP
-\fIoption = < param >\fR
-The action required. This can be reboot (default), off, on, or status.
-.TP
-\fIpasswd = < param >\fR
-Password for login.
-.TP
-\fIpasswd_script = < param >\fR
-Full path to an executable to generate the password for login.
-
-.SH SEE ALSO
-fence(8), fence_node(8)
diff --git a/fence/man/fence_scsi.8 b/fence/man/fence_scsi.8
deleted file mode 100644
index f1a29ea..0000000
--- a/fence/man/fence_scsi.8
+++ /dev/null
@@ -1,109 +0,0 @@
-.TH fence_scsi 8
-
-.SH NAME
-fence_scsi - I/O fencing agent for SCSI persistent reservations
-
-.SH SYNOPSIS
-.B
-fence_scsi
-[\fIOPTION\fR]...
-
-.SH DESCRIPTION
-fence_scsi is an I/O fencing agent that uses SCSI-3 persistent
-reservations to control access to shared storage devices. These
-devices must support SCSI-3 persistent reservations (SPC-3 or greater)
-as well as the "preempt-and-abort" subcommand.
-
-The fence_scsi agent works by having each node in the cluster register
-a unique key with the SCSI devive(s). Once registered, a single node
-will become the reservation holder by creating a "write exclusive,
-registrants only" reservation on the device(s). The result is that
-only registered nodes may write to the device(s). When a node failure
-occurs, the fence_scsi agent will remove the key belonging to the
-failed node from the device(s). The failed node will no longer be able
-to write to the device(s). A manual reboot is required.
-
-Keys are either be specified manually (see -k option) or generated
-automatically (see -n option). Automatic key generation requires that
-cman be running. Keys will then be generated using the cluster ID and
-node ID such that each node has a unique key that can be determined by
-any other node in the cluster.
-
-Devices can either be specified manually (see -d option) or discovered
-automatically. Multiple devices can be specified manually by using a
-comma-separated list. If no devices are specified, the fence_scsi
-agent will attempt to discover devices by looking for cluster volumes
-and extracting the underlying devices. Devices may be device-mapper
-multipath devices or raw devices. If using a device-mapper multipath
-device, the fence_scsi agent will find the underlying devices (paths)
-and created registrations for each path.
-
-.SH OPTIONS
-.TP
-\fB-o\fP \fIaction\fR
-Fencing action. This value can be "on", "off", or "status". All
-actions require either a key (see -k option) or node name (see -n
-option). For "on", the agent will attempt to register with the
-device(s) and create a reservation if none exists. The "off" action
-will attempt to remove a node's key from the device(s). The "status"
-action will report whether or not a node's key is currently register
-with one or more of the devices. The default action if "off".
-.TP
-\fB-d\fP \fIdevices\fR
-List of devices to use for current operation. Devices can be
-comma-separated list of raw device (eg. /dev/sdc) or device-mapper
-multipath devices (eg. /dev/dm-3). Each device must support SCSI-3
-persistent reservations.
-.TP
-\fB-f\fP \fIlogfile\fR
-Log output to file.
-.TP
-\fB-n\fP \fInodename\fR
-Name of the node to be fenced. The node name is used to generate the
-key value used for the current operation. This option will be ignored
-when used with the -k option.
-.TP
-\fB-k\fP \fIkey\fR
-Key to use for the current operation. This key should be unique to a
-node. For the "on" action, the key specifies the key use to register
-the local node. For the "off" action, this key specifies the key to be
-removed from the device(s).
-.TP
-\fB-a\fP
-Use the APTPL flag for registrations. This option is only used for the
-"on" action.
-.TP
-\fB-h\fP
-Print out a help message describing available options, then exit.
-.TP
-\fB-v\fP
-Verbose output.
-.TP
-\fB-V\fP
-Print out a version message, then exit.
-
-.SH STDIN PARAMETERS
-.TP
-\fIagent = "param"\fR
-This option is used by fence_node(8) and is ignored by fence_scsi.
-.TP
-\fInodename = "param"\fR
-Same as -n option.
-.TP
-\fIaction = "param" \fR
-Same as -o option.
-.TP
-\fIdevices = "param"\fR
-Same as -d option.
-.TP
-\fIlogfile = "param"\fR
-Same as -f option
-.TP
-\fIkey = "param"\fR
-Same as -k option.
-.TP
-\fIaptpl = "1"
-Enable the APTPL flag. Default is 0 (disable).
-
-.SH SEE ALSO
-fence(8), fence_node(8), sg_persist(8), vgs(8), cman_tool(8), cman(5)
diff --git a/fence/man/fence_vixel.8 b/fence/man/fence_vixel.8
deleted file mode 100644
index dc285c5..0000000
--- a/fence/man/fence_vixel.8
+++ /dev/null
@@ -1,70 +0,0 @@
-.TH fence_vixel 8
-
-.SH NAME
-fence_vixel - I/O Fencing agent for Vixel FC switches
-
-.SH SYNOPSIS
-.B
-fence_vixel
-[\fIOPTION\fR]...
-
-.SH DESCRIPTION
-fence_vixel is an I/O Fencing agent which can be used with Vixel FC switches.
-It logs into a Vixel switch via telnet and removes the specified port from the
-zone. Removing the zone access from the port disables the port from being able
-to access the storage.
-
-fence_vixel accepts options on the command line as well as from stdin.
-fenced sends parameters through stdin when it execs the agent. fence_vixel
-can be run by itself with command line options which is useful for testing.
-
-After a fence operation has taken place the fenced machine can no longer
-connect to the Vixel FC switch. When the fenced machine is ready to be brought
-back into the GFS cluster (after reboot) the port on the Vixel FC switch needs
-to be enabled. In order to do this, log into the Vixel FC switch. Then go to:
-
-config->zones->config <port> <comma-separated-list-of-ports-in-the-zone>
-
-Then apply
-
-Consult the Vixel manual for details
-
-.SH OPTIONS
-.TP
-\fB-a\fP \fIIPaddress\fP
-IP address of the switch.
-.TP
-\fB-h\fP
-Print out a help message describing available options, then exit.
-.TP
-\fB-n\fP \fIport\fP
-The port number to remove zoning from on the switch.
-.TP
-\fB-p\fP \fIpassword\fP
-Password for login.
-.TP
-\fB-S\fP \fIpath\fR
-Full path to an executable to generate the password for login.
-.TP
-\fB-V\fP
-Print out a version message, then exit.
-
-.SH STDIN PARAMETERS
-.TP
-\fIagent = < param >\fR
-This option is used by fence_node(8) and is ignored by fence_vixel.
-.TP
-\fIipaddr = < hostname | ip >\fR
-IP address or hostname of the switch.
-.TP
-\fIpasswd = < param >\fR
-Password for login.
-.TP
-\fIpasswd_script = < param >\fR
-Full path to an executable to generate the password for login.
-.TP
-\fIport = < param >\fR
-The port number to remove zoning from on the switch.
-
-.SH SEE ALSO
-fence(8), fence_node(8)
diff --git a/fence/man/fence_xcat.8 b/fence/man/fence_xcat.8
deleted file mode 100644
index 7da35d5..0000000
--- a/fence/man/fence_xcat.8
+++ /dev/null
@@ -1,61 +0,0 @@
-.TH fence_xcat 8
-
-.SH NAME
-fence_xcat - I/O Fencing agent for xcat environments
-
-.SH SYNOPSIS
-.B
-fence_xcat
-[\fIOPTION\fR]...
-
-.SH DESCRIPTION
-fence_xcat is a wrapper to the rpower(1) command that is distributed
-with the xCAT project available at http://www.xcat.org. Use of
-fence_xcat requires that xcat has already been properly configured
-for your environment. Refer to xCAT(1) for more information on
-configuring xCAT.
-
-fence_xcat accepts options on the command line as well as from stdin.
-fenced sends parameters through stdin when it execs the agent. fence_xcat
-can be run by itself with command line options which is useful for testing.
-
-NOTE: It is recommended that fence_bladecenter(8) is used instead of fence_xcat if
-the bladecenter firmware supports telnet. This interface is much cleaner and
-easier to setup.
-
-.SH OPTIONS
-.TP
-\fB-h\fP
-Print out a help message describing available options, then exit.
-.TP
-\fB-n\fP \fInodename\fP
-The nodename as defined in nodelist.tab of the xCAT setup.
-.TP
-\fB-o\fP \fIaction\fP
-The action required. on, off, reset (default) or stat.
-.TP
-\fB-r\fP \fIrpower\fP
-The path to the rpower binary.
-.TP
-\fB-q\fP
-Quiet mode: print only error messages.
-.TP
-\fB-V\fP
-Print out a version message, then exit.
-
-.SH STDIN PARAMETERS
-.TP
-\fIagent = < param >\fR
-This option is used by fence_node(8) and is ignored by fence_xcat.
-.TP
-\fInodename = < param >\fR
-The nodename as defined in nodelist.tab of the xCAT setup.
-.TP
-\fIaction = < param >\fR
-The action required. on, off, reset (default) or stat.
-.TP
-\fIrpower = < param >\fR
-The path to the rpower binary.
-
-.SH SEE ALSO
-fence(8), fence_node(8), fence_bladecenter(8), nodelist.tab(8), rpower(1), xCAT(1)
diff --git a/fence/man/fence_xvmd.8 b/fence/man/fence_xvmd.8
deleted file mode 100644
index 23e7c6e..0000000
--- a/fence/man/fence_xvmd.8
+++ /dev/null
@@ -1,124 +0,0 @@
-.TH fence_xvmd 8
-
-.SH NAME
-fence_xvmd - Libvirt-based, general purpose fencing host for virtual machines.
-
-.SH SYNOPSIS
-.B
-fence_xvmd
-[\fIOPTION\fR]...
-
-.SH DESCRIPTION
-fence_xvmd is an I/O Fencing host which resides on bare metal machines
-and is used in conjunction with the fence_xvm fencing agent. Together,
-these two programs can be used to fence can be used
-machines which are part of a cluster.
-
-If the virtual machines are backed by clustered storage or the virtual
-machines may be migrated to other physical machines, all physical
-machines in question must also be a part of their own CMAN/OpenAIS based
-cluster. Furthermore, the bare metal cluster is required to have
-fencing configured if virtual machine recovery is expected to be automatic.
-
-fence_xvmd accepts options on the command line and from cluster.conf
-
-.SH OPTIONS
-.TP
-\fB-f\fP
-Foreground mode (do not fork)
-.TP
-\fB-d\fP
-Enable debugging output. The more times you specify this parameter,
-the more debugging output you will receive.
-.TP
-\fB-i\fP \fIfamily\fP
-IP family to use (auto, ipv4, or ipv6; default = auto)
-.TP
-\fB-a\fP \fIaddress\fP
-Multicast address to listen on (default=225.0.0.12 for ipv4, ff02::3:1
-for ipv6)
-.TP
-\fB-p\fP \fIport\fP
-Port to use (default=1229)
-.TP
-\fB-I\fP \fIinterface\fP
-Network interface to listen on, e.g. eth0.
-.TP
-\fB-C\fP \fIauth\fP
-Authentication type (none, sha1, sha256, sha512; default=sha256). This
-controls the authentication mechanism used to authenticate clients. The
-three SHA hashes use a key which must be shared between both the virtual
-machines and the host machine or cluster. The three SHA authentication
-mechanisms use a simple bidirectional challenge-response based on pseudo-
-random number generation and a shared private key.
-.TP
-\fB-c\fP \fIhash\fP
-Packet hash type (none, sha1, sha256, sha512; default=sha256). This
-controls the hashing mechanism used to authenticate fencing requests. The
-three SHA hashes use a key which must be shared between both the virtual
-machines and the host machine or cluster.
-.TP
-\fB-k\fP \fIkey_file\fP
-Use the specified key file for packet hashing / SHA authentication.
-When both the hash type and the authentication type are set to "none",
-this parameter is ignored.
-.TP
-\fB-u\fP
-Fence by UUID instead of virtual machine name.
-.TP
-\fB-?\fP
-Print out a help message describing available options, then exit.
-.TP
-\fB-h\fP
-Print out a help message describing available options, then exit.
-.TP
-\fB-X\fP
-Do not connect to CCS for configuration; only use command line
-parameters. CCS configuration parameters override command line
-parameters (because they are cluster-wide), so if you need to
-override a configuration option contained in CCS, you must specify
-this parameter.
-.TP
-\fB-L\fP
-Local-only / non-cluster mode. When used with -X, this this option
-prevents fence_xvmd from operating as a clustered service, obviating
-the need to configure/run CMAN on the host domain.
-.TP
-\fB-U\fP \fIuri\fP
-Force use of the specified URI for connecting to the hypervisor.
-.TP
-\fB-V\fP
-Print out a version message, then exit.
-
-.SH CCS PARAMETERS
-CCS options are simply attributes of the <fence_xvmd> tag, a
-child of the <cluster> tag in /etc/cluster/cluster.conf.
-.TP
-\fIdebug="1"\fR
-Same as the -d option. Specify numbers >1 for more debugging information.
-.TP
-\fIfamily="param"\fR
-Same as the -i option.
-.TP
-\fImulticast_address="param"\fR
-Same as the -a option.
-.TP
-\fIport="param"\fR
-Same as the -p option.
-.TP
-\fIauth="param"\fR
-Same as the -C option.
-.TP
-\fIhash="param"\fR
-Same as the -c option.
-.TP
-\fIkey_file="param"\fR
-Same as the -k option.
-.TP
-\fIuse_uuid="1"\fR
-Same as the -u option.
-.TP
-
-
-.SH SEE ALSO
-fence(8), fence_node(8), fence_xvm(8)
diff --git a/fence/man/fence_zvm.8 b/fence/man/fence_zvm.8
deleted file mode 100644
index b22f8e1..0000000
--- a/fence/man/fence_zvm.8
+++ /dev/null
@@ -1,62 +0,0 @@
-.TH fence_zvm 8
-
-.SH NAME
-fence_zvm - I/O Fencing agent for GFS on s390 and zSeries VM clusters
-
-.SH SYNOPSIS
-.B
-fence_zvm
-[\fIOPTION\fR]...
-
-.SH DESCRIPTION
-fence_zvm is an I/O Fencing agent used on a GFS virtual machine in a s390 or zSeries VM cluster.
-It uses the s3270 program to log the specified virtual machine out of VM.
-For fence_zvm to execute correctly, you must have s3270 in your PATH.
-
-fence_zvm accepts options on the command line as well as from stdin.
-fence_node sends the options through stdin when it execs the agent.
-fence_zvm can be run by itself with command line options which is useful
-for testing.
-
-.SH OPTIONS
-.TP
-\fB-a\fP \fIIPaddress\fP
-IP address or hostname of the Physical machine (required).
-.TP
-\fB-h\fP
-Print out a help message describing available options, then exit.
-.TP
-\fB-u\fP \fIuserid\fP
-userid of the virtual machine to fence (required).
-.TP
-\fB-p\fP \fIpassword\fP
-password of the virtual machine to fence (required).
-.TP
-\fB-S\fP \fIpath\fR
-Full path to an executable to generate the password of the virtual machine to fence.
-.TP
-\fB-q\fP
-quiet mode, no output.
-.TP
-\fB-V\fP
-Print out a version message, then exit.
-
-.SH STDIN PARAMETERS
-.TP
-\fIagent = < param >\fP
-This option is used by fence_node(8) and is ignored by fence_zvm.
-.TP
-\fIipaddr = < hostname | ip >\fP
-IP address or hostname of the Physical machine (required).
-.TP
-\fIpasswd = < param >\fP
-password of the virtual machine to fence (required).
-.TP
-\fIpasswd_script = < param >\fR
-Full path to an executable to generate the password of the virtual machine to fence.
-.TP
-\fIuserid = < param >\fP
-userid of the virtual machine to fence (required).
-
-.SH SEE ALSO
-fence(8), fenced(8), fence_node(8)
diff --git a/make/fencebuild.mk b/make/fencebuild.mk
index 5f9915a..63ad035 100644
--- a/make/fencebuild.mk
+++ b/make/fencebuild.mk
@@ -2,6 +2,9 @@ ifndef FENCEAGENTSLIB
ifndef SBINDIRT
SBINDIRT=$(TARGET)
endif
+ ifndef MANTARGET
+ MANTARGET=$(TARGET).8
+ endif
endif
all: $(TARGET) $(MANTARGET)
@@ -22,6 +25,7 @@ $(TARGET):
-e 's#@SBINDIR@#${sbindir}#g' \
> $@
+ifdef MAKEMAN
$(MANTARGET): $(MANTARGET:.8=) ${SRCDIR}/fence/agents/lib/fence2man.xsl
set -e && \
PYTHONPATH=${OBJDIR}/fence/agents/lib \
@@ -30,3 +34,6 @@ $(MANTARGET): $(MANTARGET:.8=) ${SRCDIR}/fence/agents/lib/fence2man.xsl
clean: generalclean
rm -f $(MANTARGET) .$(MANTARGET).tmp
+else
+clean: generalclean
+endif
diff --git a/make/release.mk b/make/release.mk
index ce5950a..0bfb217 100644
--- a/make/release.mk
+++ b/make/release.mk
@@ -86,11 +86,7 @@ fence-agents-tarball: master-tarball
rm -rf bindings cman common config contrib dlm gfs* group \
rgmanager fence/fenced fence/fence_node \
fence/fence_tool fence/include fence/libfence \
- fence/libfenced fence/man/fenced.8 \
- fence/man/fence_node.8 fence/man/fence_tool.8 && \
- sed -i -e 's/fence.8//g' -e 's/fenced.8//g' \
- -e 's/fence_node.8//g' -e 's/fence_tool.8//g' \
- fence/man/Makefile
+ fence/libfenced fence/man
tar cp $(FENCEPV) | \
gzip -9 \
> ../$(FENCETGZ)
14 years, 4 months
- 1
- 0
cluster: STABLE3 - cluster.rng: updates
by David Teigland
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: e2abd6bcab89e2d2d0bd76948737e6602ab594d9
Parent: ccce692f6d174fc931d4023bc80e791eb3a12218
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Jan 13 11:53:16 2010 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Jan 13 11:53:16 2010 -0600
cluster.rng: updates
mainly of things that correspond to cluster.conf(5)
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
config/tools/xml/cluster.rng.in | 200 +++++++++++++++++++++------------------
1 files changed, 108 insertions(+), 92 deletions(-)
diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in
index 59996a3..a0820cc 100644
--- a/config/tools/xml/cluster.rng.in
+++ b/config/tools/xml/cluster.rng.in
@@ -29,21 +29,12 @@ To validate your cluster.conf against this schema, run:
-->
<start>
-<element name="cluster" rha:description="The cluster element is the
- top-level element and contains attributes that define the cluster
- name and the configuration version number.">
- <attribute name="name" rha:description="Specifies a unique cluster name;
- it can be up to 16 characters long." rha:sample="my_cluster"/>
- <attribute name="config_version" rha:description="Identifies the
- revision level of the cluster.conf file. To propagate a revised
- configuration file, this value must be advanced to a value higher
- than the current value." rha:sample="1" rha:default="1"/>
- <optional>
- <attribute name="alias" rha:description="Pretty name for cluster that
- is not parsed by cluster software; only the Conga and
- system-config-cluster GUIs use this value."
- rha:sample="My Cluster"/>
- </optional>
+<element name="cluster" rha:description="Defines cluster properties, and
+ contains all other configuration. cluster.conf(5).">
+ <attribute name="name" rha:description="Name of the cluster.
+ cluster.conf(5)"/>
+ <attribute name="config_version" rha:description="Revision level
+ of cluster.conf file. cluster.conf(5)"/>
<interleave>
<!-- cman block -->
@@ -588,120 +579,145 @@ To validate your cluster.conf against this schema, run:
<!-- logging block -->
<optional>
- <element name="logging" rha:description="Global logging config applies
- to all daemons.">
+ <element name="logging" rha:description="Defines global logging
+ configuration, and contains daemon-specific configuration.
+ cluster.conf(5)">
+
<optional>
- <attribute name="to_syslog" rha:description="enable/disable messages to
- syslog" rha:default="yes"/>
+ <attribute name="to_syslog" rha:description="Set to yes/no to
+ enable/disable messages to syslog. cluster.conf(5)"/>
</optional>
+
<optional>
- <attribute name="to_logfile" rha:description="enable/disable messages to
- log file" rha:default="yes"/>
+ <attribute name="to_logfile" rha:description="Set to yes/no to
+ enable/disable messages to log file. cluster.conf(5)"/>
</optional>
+
<optional>
- <attribute name="syslog_facility" rha:description="facility used for
- syslog messages" rha:default="daemon"/>
+ <attribute name="syslog_facility" rha:description="The facility
+ used for syslog messages. cluster.conf(5)"/>
</optional>
+
<optional>
- <attribute name="syslog_priority" rha:description="messages at this level
- and up will be sent to syslog" rha:default="info"/>
+ <attribute name="syslog_priority" rha:description="Messages at this
+ level and higher are sent to syslog. cluster.conf(5)"/>
</optional>
+
<optional>
- <attribute name="logfile_priority" rha:description="messages at this level
- and up will be written to log file" rha:default="info"/>
+ <attribute name="logfile_priority" rha:description="Messages at this
+ level and higher are written to log file. cluster.conf(5)"/>
</optional>
+
<optional>
- <attribute name="logfile" rha:description="the log file name"
- rha:default="/var/log/cluster/daemon_name.log"/>
+ <attribute name="logfile" rha:description="The log file path name.
+ cluster.conf(5)"/>
</optional>
+
<optional>
- <attribute name="debug" rha:description="turn on debugging, a shortcut for
- setting logfile_priority to debug" rha:sample="on"/>
+ <attribute name="debug" rha:description="Set to on to enable debugging
+ messages in log file. cluster.conf(5)"/>
</optional>
+
<optional>
- <element name="logging_daemon" rha:description="Per-daemon logging
- config overrides global settings for named daemon.">
- <attribute name="name" rha:description="daemon name" rha:sample="fenced"/>
+ <element name="logging_daemon" rha:description="Defines
+ daemon-specific logging configuration. cluster.conf(5)">
+
+ <attribute name="name" rha:description="The daemon name.
+ cluster.conf(5)"/>
+
<optional>
- <attribute name="subsys" rha:description="corosync subsystem name"
- rha:sample="CMAN"/>
+ <attribute name="subsys" rha:description="A corosync subsystem name.
+ cluster.conf(5)"/>
</optional>
+
<optional>
- <attribute name="to_syslog" rha:description="same as global"/>
+ <attribute name="to_syslog" rha:description="Same as global."/>
</optional>
<optional>
- <attribute name="to_logfile" rha:description="same as global"/>
+ <attribute name="to_logfile" rha:description="Same as global."/>
</optional>
<optional>
- <attribute name="syslog_facility" rha:description="same as global"/>
+ <attribute name="syslog_facility" rha:description="Same as global."/>
</optional>
<optional>
- <attribute name="syslog_priority" rha:description="same as global"/>
+ <attribute name="syslog_priority" rha:description="Same as global."/>
</optional>
<optional>
- <attribute name="logfile_priority" rha:description="same as global"/>
+ <attribute name="logfile_priority" rha:description="Same as global."/>
</optional>
<optional>
- <attribute name="logfile" rha:description="same as global"/>
+ <attribute name="logfile" rha:description="Same as global."/>
</optional>
<optional>
- <attribute name="debug" rha:description="same as global"/>
+ <attribute name="debug" rha:description="Same as global."/>
</optional>
+
</element>
</optional>
+
</element>
</optional>
<!-- end logging block -->
-<!-- clusternode block -->
- <element name="clusternodes" rha:description="This element defines the
- cluster nodes configuration; it contains one clusternode element
- per node.">
- <zeroOrMore>
- <element name="clusternode" rha:description="This element and its
- attributes define a cluster node, specifying node name, node ID,
- number of quorum votes, and fencing method for that node. There
- is one clusernode element per node in a cluster.">
- <attribute name="name" rha:description="The hostname or the IP
- address of the node." rha:sample="node-01">
- <data type="ID"/>
- </attribute>
- <attribute name="nodeid" rha:description="Each node requires
- a unique integer value as its node ID." rha:sample="1">
- <data type="positiveInteger"/>
- </attribute>
- <optional>
- <attribute name="votes" rha:description="The number of votes a
- node can cast" rha:sample="2" rha:default="1">
- <data type="positiveInteger"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="weight" rha:description="" rha:sample=""/>
- </optional>
- <optional>
- <element name="altname" rha:description="">
- <optional>
- <attribute name="name" rha:description="" rha:sample=""/>
- </optional>
- <optional>
- <attribute name="port" rha:description="" rha:sample=""/>
- </optional>
- <optional>
- <attribute name="mcast" rha:description="" rha:sample=""/>
- </optional>
- </element>
- </optional>
- <interleave>
- <optional>
- <ref name="FENCE"/>
- </optional>
- <optional>
- <ref name="UNFENCE"/>
- </optional>
- </interleave>
- </element>
- </zeroOrMore>
+<!-- clusternodes block -->
+ <element name="clusternodes" rha:description="Contains all cluster
+ node definitions. cluster.conf(5)">
+
+ <zeroOrMore>
+ <element name="clusternode" rha:description="Defines cluster node
+ properties, and contains other node specific configuration.
+ cluster.conf(5)">
+
+ <attribute name="name" rha:description="The hostname or IP address
+ of the node. cluster.conf(5)"/>
+
+ <attribute name="nodeid" rha:description="A unique integer to use
+ as a node identifier. cluster.conf(5)">
+ <data type="positiveInteger"/>
+ </attribute>
+
+ <optional>
+ <attribute name="votes" rha:description="The number of votes the
+ node contributes to quorum. cman(5)">
+ <data type="positiveInteger"/>
+ </attribute>
+ </optional>
+
+ <optional>
+ <attribute name="weight" rha:description="The dlm locking weight.
+ dlm_controld(8)"/>
+ </optional>
+
+ <optional>
+ <element name="altname" rha:description="Defines a second network
+ interface to use for corosync redundant ring mode. cman(5)">
+
+ <attribute name="name" rha:description="A second hostname or IP
+ address of the node. cman(5)"/>
+
+ <optional>
+ <attribute name="port" rha:description="The network port to use
+ on the second interface. cman(5)"/>
+ </optional>
+
+ <optional>
+ <attribute name="mcast" rha:description="The multicast address
+ to use on the second interface. cman(5)"/>
+ </optional>
+ </element>
+ </optional>
+
+ <interleave>
+ <optional>
+ <ref name="FENCE"/>
+ </optional>
+ <optional>
+ <ref name="UNFENCE"/>
+ </optional>
+ </interleave>
+
+ </element>
+ </zeroOrMore>
</element>
<!-- end clusternode block -->
14 years, 4 months
- 1
- 0
cluster: STABLE3 - man pages: cluster.conf
by David Teigland
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: ccce692f6d174fc931d4023bc80e791eb3a12218
Parent: a1a8865eba5f5f37183ba94ebf980a74c589a5be
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Jan 12 17:05:13 2010 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Jan 13 11:10:50 2010 -0600
man pages: cluster.conf
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
config/man/cluster.conf.5 | 327 ++++++++++++++++++++++++--------------------
1 files changed, 178 insertions(+), 149 deletions(-)
diff --git a/config/man/cluster.conf.5 b/config/man/cluster.conf.5
index 336a841..aa653be 100644
--- a/config/man/cluster.conf.5
+++ b/config/man/cluster.conf.5
@@ -1,208 +1,237 @@
-.TH cluster.conf 5
+.TH CLUSTER.CONF 5 2010-01-12 cluster cluster
.SH NAME
-cluster.conf - configuration file for cman, fence, dlm, gfs, rgmanager
+cluster.conf \- configuration file for cman and related daemons
-.SH DESCRIPTION
-
-The /etc/cluster/cluster.conf file contains configuration for:
-
-.B cman(5)
-for corosync and quorum configuration
-.br
-.B qdisk(5)
-for quorum disk configuration
-.br
-.B groupd(8)
-for daemon configuration
-.br
-.B fenced(8)
-for daemon and fence device configuration
-.br
-.B dlm_controld(8)
-for daemon configuration
-.br
-.B gfs_controld(8)
-for daemon configuration
-.br
-.B rgmanager(8)
-for daemon and resource configuration
-
-The same cluster.conf file must exist on each cluster node.
-
-When cman_tool starts corosync, the contents of cluster.conf are loaded into
-the corosync in-memory configuration database (confdb). Daemons and programs
-listed above use the libccs library to read cluster.conf data from the
-corosync confdb. (The libconfdb library can also be used for more general,
-non-xml confdb queries.)
-
-When cman configures corosync using cluster.conf, the corosync.conf file is
-not used.
+.SH SYNOPSIS
+.B /etc/cluster/cluster.conf
-.SS Cluster Nodes
-
-cluster.conf is an XML file. It has one top-level \fIcluster\fP section
-containing everything else. The cluster section has two mandatory
-attributes: \fIname\fP and \fIconfig_version\fP. \fIname\fP can be up to
-15 characters long (16 including terminating null) and specifies the name
-of the cluster. It is important that this name be unique among clusters
-on the same network. \fIconfig_version\fP is a number used to identify
-the revision level of the cluster.conf file.
-
- <cluster name="alpha" config_version="1">
- </cluster>
-
-The set of nodes that make up the cluster are defined under the
-\fIclusternodes\fP section. A \fIclusternode\fP section defines each
-node. A clusternode has two mandatory attributes:
-.I name
+.SH DESCRIPTION
+When
+.BR cman_tool (8)
+starts the
+.BR corosync (8)
+daemon, the cluster.conf data is read into the corosync in-memory
+database (confdb). The configuration is used by corosync,
+cman and other related cluster daemons and programs. When cman
+configures corosync with cluster.conf, the
+.BR corosync.conf (5)
+file is not used.
+
+A basic cluster configuration is described below.
+Configuration options for other daemons/programs are described in
+their own man pages.
+.BR ccs_tool (8)
+can be used to do some basic cluster.conf editing.
+
+The cluster.rng schema is used to validate cluster.conf. Unrecognized
+items will produce a warning during cluster startup, and invalid xml
+structure will cause the cluster startup to fail. See
+.BR ccs_config_validate (8)
and
-.I nodeid
+.BR ccs_config_dump (8).
+
+.SS Cluster
+The top level
+.B cluster
+section contains all other sections and has two required attributes:
+.TP 8
+.B name
+The name of the cluster can be up to 15 characters long (16 including
+terminating null). It is important that this name be unique among
+clusters on the same network.
+.TP 8
+.B config_version
+The config_version specifies the revision level of the file and should be
+increased each time the file is updated.
+.P
+.nf
+<cluster name="alpha" config_version="1">
+</cluster>
+.fi
-The name should correspond to the hostname (the fully qualified name is
-generally not necessary) on the network interface to be used for cluster
-communication. Nodeid's must be greater than zero and unique.
-
- <cluster name="alpha" config_version="1">
- <clusternodes>
- <clusternode name="node-01" nodeid="1">
- </clusternode>
-
- <clusternode name="node-02" nodeid="2">
- </clusternode>
-
- <clusternode name="node-03" nodeid="3">
- </clusternode>
- </clusternodes>
- </cluster>
+.SS Cluster Nodes
+The set of nodes that make up the cluster are defined in the
+.B clusternodes
+section which contains multiple
+.B clusternode
+sections. A clusternode has two required attributes:
+.TP 8
+.B name
+The node name should correspond to the hostname on the network interface
+to be used for cluster communication.
+.TP 8
+.B nodeid
+The node id must be greater than zero and unique.
+.P
+.nf
+<cluster name="alpha" config_version="1">
+ <clusternodes>
+ <clusternode name="node-01" nodeid="1">
+ </clusternode>
+
+ <clusternode name="node-02" nodeid="2">
+ </clusternode>
+
+ <clusternode name="node-03" nodeid="3">
+ </clusternode>
+ </clusternodes>
+</cluster>
+.fi
.SS Logging
-.br
-All daemons listed above use the <logging> section to configure loggging.
-Global settings apply to all:
-
- <logging debug="on"/>
+Cluster daemons use a common
+.B logging
+section to configure their loggging behavior.
+.P
+.nf
+<cluster name="alpha" config_version="1">
+ <logging/>
+</cluster>
+.fi
+.P
-Per-daemon settings override the corresponding global setting. logging_daemon
-names that can be configured include: corosync, qdiskd, groupd, fenced,
+Global settings apply to all:
+.P
+.nf
+<logging debug="on"/>
+.fi
+.P
+
+Per-daemon
+.B logging_daemon
+subsections override the global settings.
+Daemon names that can be configured include: corosync, qdiskd, groupd, fenced,
dlm_controld, gfs_controld, rgmanager.
+.P
+.nf
+<logging>
+ <logging_daemon name="qdiskd" debug="on"/>
+ <logging_daemon name="fenced" debug="on"/>
+</logging>
+.fi
+.P
- <logging>
- <logging_daemon name="qdiskd" debug="on"/>
- <logging_daemon name="fenced" debug="on"/>
- </logging>
-
-corosync daemon settings apply to all corosync subsystems by default, but
+Corosync daemon settings apply to all corosync subsystems by default, but
subsystems can also be configured individually. These include CLM, CPG, MAIN,
SERV, CMAN, TOTEM, QUORUM, CONFDB, CKPT, EVT.
+.P
+.nf
+<logging>
+ <logging_daemon name="corosync" subsys="QUORUM" debug="on"/>
+ <logging_daemon name="corosync" subsys="CONFDB" debug="on"/>
+</logging>
+.fi
+.P
- <logging>
- <logging_daemon name="corosync" subsys="QUORUM" debug="on"/>
- <logging_daemon name="corosync" subsys="CONFDB" debug="on"/>
- </logging>
-
-.B Settings
-.br
-The settings available at global, daemon and subsystem levels are:
+The attributes available at global, daemon and subsystem levels are:
+.TP 8
.B to_syslog
-.br
-enable/disable messages to syslog (yes/no)
-.br
-default "yes"
+enable/disable messages to syslog (yes/no), default "yes"
+.TP 8
.B to_logfile
-.br
-enable/disable messages to log file (yes/no)
-.br
-default "yes"
+enable/disable messages to log file (yes/no), default "yes"
+.TP 8
.B syslog_facility
-.br
-facility used for syslog messages
-.br
-default "daemon"
+facility used for syslog messages, default "daemon"
+.TP 8
.B syslog_priority
-.br
-messages at this level and up will be sent to syslog
-.br
-default "info"
+messages at this level and up will be sent to syslog, default "info"
+.TP 8
.B logfile_priority
-.br
-messages at this level and up will be written to log file
-.br
-default "info"
+messages at this level and up will be written to log file, default "info"
-.B logfile
-.br
+.TP 8
+.B logfile "\ "
the log file name, default /var/log/cluster/<daemon>.log
+.TP 8
.B debug="on"
-.br
-is a shortcut for logfile_priority="debug"
+a shortcut for logfile_priority="debug"
-.B Defaults
-.br
+.SH EXAMPLE
An explicit configuration for the default settings would be:
-
+.P
+.nf
<logging to_syslog="yes" to_logfile="yes" syslog_facility="daemon"
syslog_priority="info" logfile_priority="info">
-.br
<logging_daemon name="qdiskd"
logfile="/var/log/cluster/qdiskd.log"/>
-.br
- <logging_daemon name="groupd"
- logfile="/var/log/cluster/groupd.log"/>
-.br
<logging_daemon name="fenced"
logfile="/var/log/cluster/fenced.log"/>
-.br
<logging_daemon name="dlm_controld"
logfile="/var/log/cluster/dlm_controld.log"/>
-.br
<logging_daemon name="gfs_controld"
logfile="/var/log/cluster/gfs_controld.log"/>
-.br
<logging_daemon name="rgmanager"
logfile="/var/log/cluster/rgmanager.log"/>
-.br
<logging_daemon name="corosync"
logfile="/var/log/cluster/corosync.log"/>
-.br
</logging>
-
-.B Examples
-.br
-To include debug messages (and above) from all daemons in their default log files, either
-.in +7
-<logging debug="on"/> or
+.fi
+.P
+
+To include debug messages (and above) from all daemons in their default
+log files, either of the following which are equivalent:
+.P
+.nf
+<logging debug="on"/>
<logging logfile_priority="debug"/>
-.in -7
+.fi
+.P
-To exclude all log messages from syslog
-.in +7
+To exclude all log messages from syslog:
+.P
+.nf
<logging to_syslog="no"/>
-.in -7
+.fi
+.P
-To disable logging to all log files
-.in +7
+To disable logging to all log files:
+.P
+.nf
<logging to_file="no"/>
-.in -7
+.fi
+.P
-To include debug messages (and above) from all daemons in syslog
-.in +7
+To include debug messages (and above) from all daemons in syslog:
+.P
+.nf
<logging syslog_priority="debug"/>
-.in -7
+.fi
+.P
To limit syslog messages to error (and above), keeping info (and above) in
-log files (this logfile_priority setting is the default so could be omitted)
-.in +7
+log files (this logfile_priority setting is the default so could be omitted):
+.P
+.nf
<logging syslog_priority="error" logfile_priority="info"/>
-.in -7
+.fi
+.P
+.SH FILES
+.TP
+.I /etc/cluster/cluster.conf
+standard location of cluster configuration file
+.TP
+.I /usr/share/cluster/cluster.rng
+standard location of cluster.conf schema
.SH SEE ALSO
-cman(5), qdisk(5), groupd(8), fenced(8), dlm_controld(8), gfs_controld(8), rgmanager(8)
+.BR ccs_tool (8),
+.BR ccs_config_dump (8),
+.BR ccs_config_validate (8),
+.BR cman_tool (8),
+.BR cman (5),
+.BR qdisk (5),
+.BR fenced (8),
+.BR fence_node (8),
+.BR dlm_controld (8),
+.BR gfs_controld (8),
+.BR rgmanager (8)
14 years, 4 months
- 1
- 0
cluster: STABLE3 - config: Make nodeid required in ldif schema
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: a1a8865eba5f5f37183ba94ebf980a74c589a5be
Parent: e7570e2cf3535cac46f45b747d4f3c8bab3b413e
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Wed Jan 13 07:34:37 2010 -0500
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Wed Jan 13 09:35:49 2010 -0500
config: Make nodeid required in ldif schema
Fedora: bz554968
Resolves: bz555047
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
config/plugins/ldap/99cluster.ldif | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/config/plugins/ldap/99cluster.ldif b/config/plugins/ldap/99cluster.ldif
index c2ec09b..bf645a1 100644
--- a/config/plugins/ldap/99cluster.ldif
+++ b/config/plugins/ldap/99cluster.ldif
@@ -1,4 +1,4 @@
-# Auto-generated @ 2009-12-07 14:40:21
+# Auto-generated @ 2010-01-13 09:34:51
dn: cn=schema
attributeTypes: (
1.3.6.1.4.1.2312.8.1.1.15 NAME 'rhcsAlias'
@@ -314,8 +314,8 @@ attributeTypes: (
)
attributeTypes: (
1.3.6.1.4.1.2312.8.1.1.70 NAME 'rhcsUse-uuid'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ EQUALITY caseExactIA5Match
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE
)
attributeTypes: (
@@ -1605,8 +1605,8 @@ objectClasses: (
# )
objectClasses: (
1.3.6.1.4.1.2312.8.1.2.10 NAME 'rhcsClusternode' SUP top STRUCTURAL
- MUST ( name )
- MAY ( rhcsWeight $ rhcsNodeid $ rhcsVotes )
+ MUST ( rhcsNodeid $ name )
+ MAY ( rhcsWeight $ rhcsVotes )
)
objectClasses: (
1.3.6.1.4.1.2312.8.1.2.11 NAME 'rhcsAltname' SUP top STRUCTURAL
14 years, 4 months
- 1
- 0
cluster: STABLE3 - config: Make nodeid attribute required
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: e7570e2cf3535cac46f45b747d4f3c8bab3b413e
Parent: 782af69a42d72df92ca9921cc9e2dbb8c6408d35
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Wed Jan 13 07:34:37 2010 -0500
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Wed Jan 13 09:22:06 2010 -0500
config: Make nodeid attribute required
Fedora: bz554968
Resolves: bz555047
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
config/tools/xml/cluster.rng.in | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in
index 4344fda..59996a3 100644
--- a/config/tools/xml/cluster.rng.in
+++ b/config/tools/xml/cluster.rng.in
@@ -666,6 +666,10 @@ To validate your cluster.conf against this schema, run:
address of the node." rha:sample="node-01">
<data type="ID"/>
</attribute>
+ <attribute name="nodeid" rha:description="Each node requires
+ a unique integer value as its node ID." rha:sample="1">
+ <data type="positiveInteger"/>
+ </attribute>
<optional>
<attribute name="votes" rha:description="The number of votes a
node can cast" rha:sample="2" rha:default="1">
@@ -673,12 +677,6 @@ To validate your cluster.conf against this schema, run:
</attribute>
</optional>
<optional>
- <attribute name="nodeid" rha:description="Each node requires
- a unique integer value as its node ID." rha:sample="1">
- <data type="positiveInteger"/>
- </attribute>
- </optional>
- <optional>
<attribute name="weight" rha:description="" rha:sample=""/>
</optional>
<optional>
14 years, 4 months
- 1
- 0
cluster: STABLE3 - release: don't build gfs-utils tarball
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 782af69a42d72df92ca9921cc9e2dbb8c6408d35
Parent: cbda23276ca6534115fc5f93bfd706e45caea39a
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue Jan 12 12:09:06 2010 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Tue Jan 12 12:09:06 2010 +0100
release: don't build gfs-utils tarball
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
make/release.mk | 18 ------------------
1 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/make/release.mk b/make/release.mk
index be29aaf..ce5950a 100644
--- a/make/release.mk
+++ b/make/release.mk
@@ -47,11 +47,6 @@ RGMPROJECT=rgmanager
RGMPV=$(RGMPROJECT)-$(VERSION)
RGMTGZ=$(TEST)$(RGMPV).tar.gz
-# gfs-utils
-GFSPROJECT=gfs-utils
-GFSPV=$(GFSPROJECT)-$(VERSION)
-GFSTGZ=$(TEST)$(GFSPV).tar.gz
-
all: tag tarballs
ifdef RELEASE
@@ -67,7 +62,6 @@ tarballs: master-tarball
tarballs: fence-agents-tarball
tarballs: resource-agents-tarball
tarballs: rgmanager-tarball
-tarballs: gfs-tarball
master-tarball:
git archive \
@@ -128,23 +122,11 @@ rgmanager-tarball: master-tarball
> ../$(RGMTGZ)
rm -rf $(RGMPV)
-gfs-tarball: master-tarball
- tar zxpf ../$(MASTERTGZ)
- mv $(MASTERPROJECT)-$(VERSION) $(GFSPV)
- cd $(GFSPV) && \
- rm -rf bindings cman common config contrib dlm fence group \
- rgmanager gfs2
- tar cp $(GFSPV) | \
- gzip -9 \
- > ../$(GFSTGZ)
- rm -rf $(GFSPV)
-
publish:
git push --tags origin
scp ../$(MASTERTGZ) \
../$(FENCETGZ) \
../$(RASTGZ) \
- ../$(GFSTGZ) \
../$(RGMTGZ) \
fedorahosted.org:$(MASTERPROJECT)
git log $(MASTERPROJECT)-$(OLDVER)..$(MASTERPV) | \
14 years, 4 months
- 1
- 0
cluster: the annotated tag cluster-3.0.7 has been created
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: af4a63780d35d96f5aeb236acf5057e74776cb83
Parent: 0000000000000000000000000000000000000000
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: 2010-01-12 11:02 +0000
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: 2010-01-12 11:02 +0000
annotated tag: cluster-3.0.7 has been created
at af4a63780d35d96f5aeb236acf5057e74776cb83 (tag)
tagging cbda23276ca6534115fc5f93bfd706e45caea39a (commit)
replaces cluster-3.0.6
cluster-3.0.7 release
Abhijith Das (1):
gfs2_quota: Bug 536902 - quota file size not a multiple of struct gfs2_quota
Andrew Beekhof (1):
gfs_controld.pcmk - Implement the setup_cluster and fenced_node_info hooks
Bob Peterson (3):
GFS2: gfs2_edit savemeta bugs
gfs_fsck: Don't try to convert free_meta to free if -n was specified.
gfs_fsck: Don't try to convert free inodes to free if -n was specified.
Christine Caulfield (1):
cman: Make cman quit if it has an old config when it starts up
David Teigland (3):
group_tool: remove "groupd not running" (another)
cluster.rng: fence_daemon updates
man pages: fenced, fence_tool, fence_node, fence_ack_manual
Fabio M. Di Nitto (15):
cman init: don't start cluster if NM is running or about to run
cman_tool: make it the authoritative tool to enable a new configuration
cman init: add horrid workaround to some other issues
gfs2: fix build failure
fence lpar: fix quoting
gfs: disable gfs kernel and userland tool build by default
build: fix typo in configure
build: fix Makefile filters for gfs
build: fix fence man page stuff
cman init: check for cman_tool before executing the script
cman init: drop use of test in favour of shell bits
cman init: add check for executable
Revert "cman init: add horrid workaround to some other issues"
fence agents: drop build date
misc: update copyright year across the board
Lon Hohberger (14):
rgmanager: Fix relocation & migration errors
rgmanager: Add debug information to dumps
rgmanager: Move prototypes in to correct header
config: Remove data type="string"
config: Fix build warning in rng2ldif
rgmanager: Fix build warnings
rgmanager: Fix bind mount handling in fs.sh
fence-agents: Add missing state handling to fence_virsh
rgmanager: Fix erroneous bind mount warning in fs.sh
rgmanager: Make clusvcadm check msg_send return code
rgmanager: Fix event generation with central_processing
resource-agents: Add missing btrfs & ext4 support
rgmanager: Allow non-root clustat
rgmanager: Fix compiler warning
Marek 'marx' Grac (4):
fencing: Change default timeout values for LPAR and IPMI
fencing: Version information not shown
fencing: Add support for identity files
fencing: fence_rsa fails to login
Ryan O'Hara (3):
Add error messages to fence_scsi as well as a few comments.
Add debug messages to subroutines that perform sg_persist operations.
Add support for metadata action.
Shane Bradley (1):
rgmanager: Fix ipv6 handling
14 years, 4 months
- 1
- 0
gfs1-utils: master - misc: update copyright year across the board
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/gfs1-utils.git?p=gfs1-utils.git;a=commitd...
Commit: 5826fd5fff17235521d00b0e93150981cfb68ea0
Parent: 8345fb9996e424019439f03690b836e9a91def5a
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue Jan 12 06:47:48 2010 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Tue Jan 12 06:47:48 2010 +0100
misc: update copyright year across the board
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
doc/COPYRIGHT | 6 +++---
make/copyright.cf | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/COPYRIGHT b/doc/COPYRIGHT
index 9c7a8ac..13ed861 100644
--- a/doc/COPYRIGHT
+++ b/doc/COPYRIGHT
@@ -1,14 +1,14 @@
Unless specified otherwise in the "exceptions section" below:
Copyright (C) 1997-2003 Sistina Software, Inc. All rights reserved.
-Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
+Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
Exceptions:
gfs/man/gfs_mount.8:
Portions copyright (C) 2001-2003 The OpenGFS Project
Portions copyright (C) 2004 <ben.m.cahill at intel.com>
- Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
+ Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
gfs-kernel/src/gfs/fixed_div64.h:
Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved.
@@ -17,7 +17,7 @@ gfs-kernel/src/gfs/fixed_div64.h:
http://www.sgi.com
For further information regarding this notice, see:
http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
- Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
+ Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
Authors as known by current RCS as of the time of writing:
diff --git a/make/copyright.cf b/make/copyright.cf
index 1c8e7f4..3801aa9 100644
--- a/make/copyright.cf
+++ b/make/copyright.cf
@@ -1,6 +1,6 @@
#ifndef __COPYRIGHT_DOT_CF__
#define __COPYRIGHT_DOT_CF__
-#define REDHAT_COPYRIGHT "Copyright (C) Red Hat, Inc. 2004-2009 All rights reserved."
+#define REDHAT_COPYRIGHT "Copyright (C) Red Hat, Inc. 2004-2010 All rights reserved."
#endif /* __COPYRIGHT_DOT_CF__ */
14 years, 4 months
- 1
- 0
rgmanager: master - misc: update copyright year across the board
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdif...
Commit: 94ab84b61b3b4efe5c52a3ecf448cd305aec1511
Parent: 5a249f4cae6fc27d7ab026e553618f33439cffda
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Tue Jan 12 06:46:35 2010 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Tue Jan 12 06:46:35 2010 +0100
misc: update copyright year across the board
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
doc/COPYRIGHT | 26 +++++++++++++-------------
make/copyright.cf | 2 +-
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/doc/COPYRIGHT b/doc/COPYRIGHT
index b95cc7e..8339eef 100644
--- a/doc/COPYRIGHT
+++ b/doc/COPYRIGHT
@@ -1,7 +1,7 @@
Unless specified otherwise in the "exceptions section" below:
Copyright (C) 1997-2003 Sistina Software, Inc. All rights reserved.
-Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
+Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
Exceptions:
@@ -23,58 +23,58 @@ Portions of this code (C) 2000-2001 Mission Critical Linux, Inc.
rgmanager/include/clulog.h:
Copyright (C) 2000 Mission Critical Linux
- Copyright (C) 2002-2009 Red Hat, Inc. All rights reserved.
+ Copyright (C) 2002-2010 Red Hat, Inc. All rights reserved.
Author: Jeff Moyer <moyer at missioncriticallinux.com>
rgmanager/src/clulib/clulog.c:
Copyright (C) 2000 Mission Critical Linux
- Copyright (C) 2002-2009 Red Hat, Inc. All rights reserved.
+ Copyright (C) 2002-2010 Red Hat, Inc. All rights reserved.
Author: Jeff Moyer <moyer at missioncriticallinux.com>
rgmanager/src/clulib/daemon_init.c:
Copyright (C) 2000 Mission Critical Linux
- Copyright (C) 2002-2009 Red Hat, Inc. All rights reserved.
+ Copyright (C) 2002-2010 Red Hat, Inc. All rights reserved.
Author: Jeff Moyer <moyer at missioncriticallinux.com>
rgmanager/src/clulib/msgsimple.c:
Copyright (C) 2000 Mission Critical Linux
- Copyright (C) 2002-2009 Red Hat, Inc. All rights reserved.
+ Copyright (C) 2002-2010 Red Hat, Inc. All rights reserved.
rgmanager/src/clulib/tmgr.c:
Copyright (C) 2006-2007 Crosswalk.
- Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved.
+ Copyright (C) 2007-2010 Red Hat, Inc. All rights reserved.
rgmanager/src/clulib/wrap_lock.c:
Copyright (C) 2006-2007 Crosswalk.
- Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved.
+ Copyright (C) 2007-2010 Red Hat, Inc. All rights reserved.
rgmanager/src/daemons/groups.c:
Copyright (C) 2000 Mission Critical Linux
- Copyright (C) 2002-2009 Red Hat, Inc. All rights reserved.
+ Copyright (C) 2002-2010 Red Hat, Inc. All rights reserved.
rgmanager/src/daemons/main.c:
Copyright (C) 2000 Mission Critical Linux
- Copyright (C) 2002-2009 Red Hat, Inc. All rights reserved.
+ Copyright (C) 2002-2010 Red Hat, Inc. All rights reserved.
rgmanager/src/utils/clubufflush.c:
Copyright (C) 2000 Mission Critical Linux
- Copyright (C) 2002-2009 Red Hat, Inc. All rights reserved.
+ Copyright (C) 2002-2010 Red Hat, Inc. All rights reserved.
Author: Gregory P. Myrdal <Myrdal at MissionCriticalLinux.Com>
rgmanager/src/utils/clufindhostname.c:
Copyright (C) 2000 Mission Critical Linux
- Copyright (C) 2002-2009 Red Hat, Inc. All rights reserved.
+ Copyright (C) 2002-2010 Red Hat, Inc. All rights reserved.
Richard Rabbat <rabbat at missioncriticallinux.com>
rgmanager/src/utils/clulog.c:
Copyright (C) 2000 Mission Critical Linux
- Copyright (C) 2002-2009 Red Hat, Inc. All rights reserved.
+ Copyright (C) 2002-2010 Red Hat, Inc. All rights reserved.
Author: Jeff Moyer <moyer at missioncriticallinux.com>
rgmanager/src/utils/syscall.h
Copyright (C) 1995-1997 Olaf Kirch <okir at monad.swb.de>
Copyright (C) 1997-2003 Sistina Software, Inc. All rights reserved.
- Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
+ Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
Authors as known by current RCS as of the time of writing:
diff --git a/make/copyright.cf b/make/copyright.cf
index 1c8e7f4..3801aa9 100644
--- a/make/copyright.cf
+++ b/make/copyright.cf
@@ -1,6 +1,6 @@
#ifndef __COPYRIGHT_DOT_CF__
#define __COPYRIGHT_DOT_CF__
-#define REDHAT_COPYRIGHT "Copyright (C) Red Hat, Inc. 2004-2009 All rights reserved."
+#define REDHAT_COPYRIGHT "Copyright (C) Red Hat, Inc. 2004-2010 All rights reserved."
#endif /* __COPYRIGHT_DOT_CF__ */
14 years, 4 months
- 1
- 0