Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com... Commit: d168962374ab52999d1be46fa218fb66066833da Parent: d2c04e14faa0da39a8d3fe2b54fa628617b6a8c5 Author: Digimer <digital.mermaid(a)gmail.com&gt; AuthorDate: Sat Nov 27 22:47:58 2010 -0500 Committer: Digimer <digital.mermaid(a)gmail.com&gt; CommitterDate: Sat Nov 27 22:47:58 2010 -0500 fence_na: Updated node_assassin to v1.1.6. Fixed a few bugs and cleaned up the configuration file and docs to be more neutral and professional. --- fence/agents/node_assassin/fence_na.conf.in | 33 ++++++++++++++------------ fence/agents/node_assassin/fence_na.lib.in | 10 +++++--- fence/agents/node_assassin/fence_na.pl | 7 ++++- fence/agents/node_assassin/fence_na.pod.in | 14 +++++----- 4 files changed, 36 insertions(+), 28 deletions(-) diff --git a/fence/agents/node_assassin/fence_na.conf.in b/fence/agents/node_assassin/fence_na.conf.in index 3ae6866..53a8956 100644 --- a/fence/agents/node_assassin/fence_na.conf.in +++ b/fence/agents/node_assassin/fence_na.conf.in @@ -4,9 +4,11 @@ # # Node Assassin - Fence Agent # Digimer; digimer(a)alteeve.com -# Jun. 27, 2010 -# Version: 1.1.5 - +# Nov. 27, 2010 +# Version: 1.1.6 +# +# This software is released under the GPL v2. See the LICENSE file for a copy +# of the GPL v2. ############################################################################### # System: # @@ -19,9 +21,9 @@ system::na_num = 1 # Version of the fence_na fence agent. -system::agent_version = 1.1.5.1 +system::agent_version = 1.1.6 -# This is the log file. If unset, no logging will occur. If using '@LOGDIR@', +# This is the log file. If unset, no logging will occur. If using '/var/log/', # be sure that this agent is able to create or edit the file. The default is to # write to '/tmp' to prevent accidental failure of the agent due to # misconfiguration. @@ -38,7 +40,7 @@ system::debug = 0 # This is the authentication information... It is currently a simple plain text # compare, but this will change prior to first release. -system::username = motoko +system::username = admin system::password = secret @@ -50,15 +52,16 @@ system::password = secret ### Define values for Node 1. -# The nodes name. This must match exactly with the name set in the given node. -na::1::na_name = Motoko +# The node assassin name. This must match exactly with the name programmed into +# the given node. +na::1::na_name = fence_na01 # This is the IP address and port where I will connect to this node at. -# NOTE: THIS MUST MATCH THE VALUE USED IN '@CONFDIR@/@CONFFILE@'! If you used a -# resolvable name there, use the same name here. Vice versa for IP addresses. -# If this doesn't match the 'ipaddr' argument sent by the 'fenced' daemon the -# fence will not work properly! -na::1::ipaddr = motoko.alteeve.com +# NOTE: THIS MUST MATCH THE VALUE USED IN '@CONFDIR@/@CONFFILE@'! If you +# used a resolvable name there, use the same name here. Vice versa for IP +# addresses. If this doesn't match the 'ipaddr' argument sent by the 'fenced' +# daemon the fence will not work properly! +na::1::ipaddr = fence_na01.domain.com na::1::tcp_port = 238 # This is the number of nodes supported by this Node Assassin @@ -77,8 +80,8 @@ na::1::gateway = 192.168.1.1 # then the 'list' action will return '<node_id>,<value>'. If a port is not # defined, 'list' will return '<node_id>,<node::X::name-node_id>'. If a port is # set to 'unused', it will be skipped when replying to a 'list'. -na::1::alias::1 = an_node01.alteeve.com -na::1::alias::2 = an_node02.alteeve.com +na::1::alias::1 = node01.domain.com +na::1::alias::2 = node02.domain.com na::1::alias::3 = unused na::1::alias::4 = unused diff --git a/fence/agents/node_assassin/fence_na.lib.in b/fence/agents/node_assassin/fence_na.lib.in index aa7300e..67d5367 100644 --- a/fence/agents/node_assassin/fence_na.lib.in +++ b/fence/agents/node_assassin/fence_na.lib.in @@ -4,9 +4,11 @@ # # Node Assassin - Fence Agent # Digimer; digimer(a)alteeve.com -# Jun. 27, 2010. -# Version: 1.1.5 +# Nov. 27, 2010. +# Version: 1.1.6 # +# This software is released under the GPL v2. See the LICENSE file for a copy +# of the GPL v2. # This connects to a Node Assassin and puts the handle in @@ -242,8 +244,8 @@ sub no_connection_error my ($conf, $log, $na_id)=@_; record ($conf, $log, "\nERROR: Unable to query Node Assassin: [$conf->{na}{$na_id}{na_name}]!\n", 1); record ($conf, $log, "ERROR: Please check that it is connected, that the information in\n", 1); - record ($conf, $log, "ERROR: '@NACONFFILE@' is accurate and that the proper configuration\n", 1); - record ($conf, $log, "ERROR: has be uploaded to the device.\n\n", 1); + record ($conf, $log, "ERROR: '@NACONFFILE@' is accurate and that the proper\n", 1); + record ($conf, $log, "ERROR: configuration has be uploaded to the device.\n\n", 1); return (0); } diff --git a/fence/agents/node_assassin/fence_na.pl b/fence/agents/node_assassin/fence_na.pl old mode 100644 new mode 100755 index 0d272b3..bc7fb00 --- a/fence/agents/node_assassin/fence_na.pl +++ b/fence/agents/node_assassin/fence_na.pl @@ -2,8 +2,11 @@ # # Node Assassin - Fence Agent # Digimer; digimer(a)alteeve.com -# Jun. 27, 2010 -# Version: 1.1.5 +# Nov. 25, 2010 +# Version: 1.1.6 +# +# This software is released under the GPL v2. See the LICENSE file in the +# configuration directory for a copy of the GPL v2. # # Bugs; # - None known, many expected diff --git a/fence/agents/node_assassin/fence_na.pod.in b/fence/agents/node_assassin/fence_na.pod.in index c3ec4e4..7bd6a3c 100644 --- a/fence/agents/node_assassin/fence_na.pod.in +++ b/fence/agents/node_assassin/fence_na.pod.in @@ -10,7 +10,7 @@ This is the fence agent for the Node Assassin fence device. =head1 SYNOPSIS - fence_na -a motoko.alteeve.com -n 2 -l motoko -p secret -o off + fence_na -a fence_na01.domain.com -n 2 -l admin -p secret -o off =head1 DESCRIPTION @@ -161,21 +161,21 @@ The power feeds of all nodes on the Node Assassin are checked. Any found to be o To simulate how 'fenced' calls the script, create a text file called C<args.txt> containing: # Test file used as input for the NA fence agent. - ipaddr=ariel.alteeve.com + ipaddr=fence_na01.domain.com port=02 - login=motoko + login=admin passwd=secret - action=off + action=reboot Now use C<cat> to pipe the contents into the fence agent: cat args.txt | fence_na -This will call the C<off> function against node #02 connected to the Node Assassin at C<motoko.alteeve.com>, fencing it. Change the C<action> line to C<action=on> and re-run the script to release the fence and boot the node. +This will call the C<off> function against node #02 connected to the Node Assassin at C<fence_na01.domain.com>, fencing it. Change the C<action> line to C<action=on> and re-run the script to release the fence and boot the node. To duplicate the same call using command line arguments: - fence_na -a motoko.alteeve.com -n 2 -l motoko -p secret -o off + fence_na -a fence_na01.domain.com -n 2 -l admin -p secret -o reboot =head1 SEE ALSO @@ -183,6 +183,6 @@ http://nodeassassin.org =head1 UPDATED -Jun. 26, 2010 +Nov. 27, 2010 Digimer (digimer(a)alteeve.com)