* Updated Remote->call() to take the new 'background' parameter.

* Continues work on adding new disks (DRBD volumes) to anvil-manage-server-storage.
* Updated DRBD->get_status() to record the peer-role.

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

Anvil/Tools/DRBD.pm

@@ -2291,12 +2291,14 @@ sub get_status
 			$anvil->data->{drbd}{status}{$host}{resource}{$resource}{connection}{$peer_name}{congested}          = $hash_ref->{connections}->[$i]->{congested};
 			$anvil->data->{drbd}{status}{$host}{resource}{$resource}{connection}{$peer_name}{'connection-state'} = $hash_ref->{connections}->[$i]->{'connection-state'};
 			$anvil->data->{drbd}{status}{$host}{resource}{$resource}{connection}{$peer_name}{'peer-node-id'}     = $hash_ref->{connections}->[$i]->{'peer-node-id'};
+			$anvil->data->{drbd}{status}{$host}{resource}{$resource}{connection}{$peer_name}{'peer-role'}        = $hash_ref->{connections}->[$i]->{'peer-role'};
 			$anvil->data->{drbd}{status}{$host}{resource}{$resource}{connection}{$peer_name}{'rs-in-flight'}     = $hash_ref->{connections}->[$i]->{'rs-in-flight'};
 			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { 
 				"drbd::status::${host}::resource::${resource}::connection::${peer_name}::ap-in-flight"     => $anvil->data->{drbd}{status}{$host}{resource}{$resource}{connection}{$peer_name}{'ap-in-flight'},
 				"drbd::status::${host}::resource::${resource}::connection::${peer_name}::congested"        => $anvil->data->{drbd}{status}{$host}{resource}{$resource}{connection}{$peer_name}{congested},
 				"drbd::status::${host}::resource::${resource}::connection::${peer_name}::connection-state" => $anvil->data->{drbd}{status}{$host}{resource}{$resource}{connection}{$peer_name}{'connection-state'},
 				"drbd::status::${host}::resource::${resource}::connection::${peer_name}::peer-node-id"     => $anvil->data->{drbd}{status}{$host}{resource}{$resource}{connection}{$peer_name}{'peer-node-id'},
+				"drbd::status::${host}::resource::${resource}::connection::${peer_name}::peer-role"        => $anvil->data->{drbd}{status}{$host}{resource}{$resource}{connection}{$peer_name}{'peer-role'},
 				"drbd::status::${host}::resource::${resource}::connection::${peer_name}::rs-in-flight"     => $anvil->data->{drbd}{status}{$host}{resource}{$resource}{connection}{$peer_name}{'rs-in-flight'},
 			}});
 			

Anvil/Tools/Remote.pm

@@ -224,9 +224,13 @@ B<NOTE>: By default, a connection to a target will be held open and cached to in
 
 Parameters;
 
+=head3 background (optional, default '0')
+
+If set to C<< 1 >>, the command is run in the background. In this case, the PID of the SSH process is returned. The called should use C<< waitpid >> to ensure the PID has been reaped.
+
 =head3 close (optional, default '0')
 
-If set, the connection to the target will be closed at the end of the call.
+If set to C<< 1 >>, the connection to the target will be closed at the end of the call.
 
 =head3 log_level (optional, default C<< 3 >>)
 
@@ -300,9 +304,10 @@ sub call
 	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { "cache::ssh_fh::${ssh_fh_key}" => $anvil->data->{cache}{ssh_fh}{$ssh_fh_key} }});
 	
 	# Now pick up the rest of the variables.
+	my $background  = defined $parameter->{background} ? $parameter->{background} : 0;
 	my $close       = defined $parameter->{'close'}    ? $parameter->{'close'}    : 0;
 	my $no_cache    = defined $parameter->{no_cache}   ? $parameter->{no_cache}   : 0;
-	my $password    = defined $parameter->{password}   ? $parameter->{password}   : $anvil->data->{sys}{root_password};
+	my $password    = defined $parameter->{password}   ? $parameter->{password}   : "";
 	my $secure      = defined $parameter->{secure}     ? $parameter->{secure}     : 0;
 	my $shell_call  = defined $parameter->{shell_call} ? $parameter->{shell_call} : "";
 	my $timeout     = defined $parameter->{timeout}    ? $parameter->{timeout}    : 10;
@@ -310,17 +315,27 @@ sub call
 	my $ssh_fh      = $anvil->data->{cache}{ssh_fh}{$ssh_fh_key};
 	# NOTE: The shell call might contain sensitive data, so we show '--' if 'secure' is set and $anvil->Log->secure is not.
 	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { 
+		background => $background, 
 		'close'    => $close, 
 		password   => $anvil->Log->is_secure($password), 
 		secure     => $secure, 
 		shell_call => (not $secure) ? $shell_call : $anvil->Log->is_secure($shell_call), 
 		ssh_fh     => $ssh_fh, 
 		start_time => $start_time, 
+		timeout    => $timeout, 
 		port       => $port, 
 		target     => $target, 
 		ssh_fh_key => $ssh_fh_key, 
 	}});
 	
+	if ((not $password) && (defined $anvil->data->{sys}{root_password}))
+	{
+		$password = $anvil->data->{sys}{root_password};
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { 
+			password => $anvil->Log->is_secure($password), 
+		}});
+	}
+	
 	# In case 'target' is our short host name, change it to ''.
 	if ($target eq $anvil->Get->short_host_name())
 	{
@@ -634,6 +649,14 @@ sub call
 	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, secure => $secure, list => { ssh_fh => $ssh_fh }});
 	if ($ssh_fh =~ /^Net::OpenSSH/)
 	{
+		# Are we doing a background call?
+		if ($background)
+		{
+			my $pid = $ssh_fh->spawn($shell_call);
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, secure => $secure, list => { pid => $pid }});
+			return($pid);
+		}
+		
 		# The shell_call can't end is a newline. Conveniently, we want the return code. By adding 
 		# this, we ensure it doesn't end in a new-line (and we can't blindly strip off the last 
 		# new-line because of 'EOF' type cat's). 

tools/anvil-provision-server

@@ -848,7 +848,8 @@ sub startup_resource
 	my $short_host_name = $anvil->data->{job}{short_host_name};
 	my $role            = defined $anvil->data->{drbd}{status}{$short_host_name}{resource}{$server}{role} ? $anvil->data->{drbd}{status}{$short_host_name}{resource}{$server}{role} : "";
 	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
-		'job::server' => $anvil->data->{job}{server_name}, 
+		server          => $server, 
+		short_host_name => $short_host_name, 
 		role            => $role,
 	}});