No longer fail is fence method exists already when trying to create it.

* Also fixed a string insertion variable typo

Signed-off-by: digimer <mkelly@alteeve.ca>

share/words.xml

@@ -203,8 +203,8 @@ The error was:
 		<key name="error_0134">Failed to start the daemon: [#!variable!daemon!#] on the local system, unable to boot the server.</key>
 		<key name="error_0135">Failed to start the daemon: [#!variable!daemon!#] on [#!variable!host!#], unable to boot the server.</key>
 		<key name="error_0136">System->test_ipmi() was called with an invalid 'lanplus' parameter. It must be 'yes', 'no', 'yes-no' or 'no-yes'. Received: [#!variable!lanplus!#].</key>
-		<key name="error_0137">All attempts to change the IPMI user: [#!variable!user_name!#] (number: [#!variable!user_number!#] failed. The last try's output (if any) was: [#!variable!output!#] (return code: [#!variable!return code!#]).</key>
+		<key name="error_0137">All attempts to change the IPMI user: [#!variable!user_name!#] (number: [#!variable!user_number!#] failed. The last try's output (if any) was: [#!variable!output!#] (return code: [#!variable!return_code!#]).</key>
-		<key name="error_0138">The system call: [#!variable!shell_call!#] failed with the return code: [#!variable!return code!#]. The output (if any) was;
+		<key name="error_0138">The system call: [#!variable!shell_call!#] failed with the return code: [#!variable!return_code!#]. The output (if any) was;
 ====
 #!variable!output!#
 ====</key>
@@ -4191,6 +4191,7 @@ We will try to proceed anyway.</key>
 		<key name="warning_0171">[ Warning ] - The daemon: [#!variable!daemon!#] appears to have failed! Attempting to restart it now.</key>
 		<key name="warning_0172">[ Warning ] - The line: [#!variable!line!#] that was going to be added to the hosts file is invalid, removing it.</key>
 		<key name="warning_0173">[ Warning ] - Failed to convert: [#!variable!source_file!#] to: [#!variable!new_file!#] (format: [#!variable!format!#]! Return code was: [#!variable!return_code!#], expected '0'.</key>
+		<key name="warning_0174">[ Warning ] - The fence method: [#!variable!method!#] already existed, proceeding.</key>
 		
 	</language>
 	<!-- 日本語 -->

tools/anvil-join-anvil

@@ -989,7 +989,7 @@ sub configure_pacemaker
 					pcs_add_command => $pcs_add_command =~ /passw/ ? $anvil->Log->is_secure($pcs_add_command) : $pcs_add_command,
 				}});
 				
-				# If there's an entry in the CIB, so if it's different somehow
+				# If there's an entry in the CIB, see if it's different somehow
 				if (exists $anvil->data->{cib}{parsed}{data}{node}{$node_name}{fencing}{device}{$ipmi_stonith_name})
 				{
 					foreach my $argument (sort {$a cmp $b} keys %{$anvil->data->{cib}{parsed}{data}{node}{$node_name}{fencing}{device}{$ipmi_stonith_name}{argument}})
@@ -1115,15 +1115,25 @@ sub configure_pacemaker
 				}});
 				if ($return_code)
 				{
-					# Something went wrong.
+					# If this is because the method already exists, ignore the error.
-					$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 0, priority => "err", key => "error_0138", variables => {
+					if ($output =~ /already exists/i)
-						shell_call  => $shell_call, 
+					{
-						output      => $output, 
+						$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, priority => "alert", key => "warning_0174", variables => {
-						return_code => $return_code, 
+							method => $ipmi_stonith_name, 
-					}});
+						}});
-					update_progress($anvil, 0, "error_0138,!!shell_call!".$shell_call."!!,!!output!".$output."!!,!!return_code!".$return_code."!!");
+					}
-					sleep 2;
+					else
-					$anvil->nice_exit({exit_code => 6});
+					{
+						# Something went wrong.
+						$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 0, priority => "err", key => "error_0138", variables => {
+							shell_call  => $shell_call, 
+							output      => $output, 
+							return_code => $return_code, 
+						}});
+						update_progress($anvil, 0, "error_0138,!!shell_call!".$shell_call."!!,!!output!".$output."!!,!!return_code!".$return_code."!!");
+						sleep 2;
+						$anvil->nice_exit({exit_code => 6});
+					}
 				}
 				
 				$something_changed->{$node_name} = 1;