xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 19:32:31 +00:00
Code Issues Releases Wiki Activity

Removed the use of "-f IMMED" when powering off a VM because using smcli Image_Deactivate without the "-f" option powers off the VM more cleanly and accomplished the same thing.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@16077 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt
2013-04-26 15:32:59 +00:00
parent 0d67ef61e7
commit 6f94c8dcbe
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
xCAT-server/lib/xcat/plugins/zvm.pm
View File

@@ -2298,8 +2298,8 @@ sub powerVM {
# Power off virtual server
elsif ( $args->[0] eq 'off' ) {
$out = `ssh $::SUDOER\@$hcp "$::SUDO $::DIR/smcli Image_Deactivate -T $userId -f IMMED"`;
xCAT::zvmUtils->printSyslog("smcli Image_Deactivate -T $userId -f IMMED");
$out = `ssh $::SUDOER\@$hcp "$::SUDO $::DIR/smcli Image_Deactivate -T $userId"`;
xCAT::zvmUtils->printSyslog("smcli Image_Deactivate -T $userId");
xCAT::zvmUtils->printLn( $callback, "$node: $out" );
}
@@ -2308,8 +2308,8 @@ sub powerVM {
$out = `ssh -o ConnectTimeout=10 $::SUDOER\@$node "shutdown -h now"`;
sleep(90); # Wait 1.5 minutes before logging user off
$out = `ssh $::SUDOER\@$hcp "$::SUDO $::DIR/smcli Image_Deactivate -T $userId -f IMMED"`;
xCAT::zvmUtils->printSyslog("smcli Image_Deactivate -T $userId -f IMMED");
$out = `ssh $::SUDOER\@$hcp "$::SUDO $::DIR/smcli Image_Deactivate -T $userId"`;
xCAT::zvmUtils->printSyslog("smcli Image_Deactivate -T $userId");
xCAT::zvmUtils->printLn( $callback, "$node: $out" );
}
@@ -2330,8 +2330,8 @@ sub powerVM {
# Reset a virtual server
elsif ( $args->[0] eq 'reset' ) {
$out = `ssh $::SUDOER\@$hcp "$::SUDO $::DIR/smcli Image_Deactivate -T $userId -f IMMED"`;
xCAT::zvmUtils->printSyslog("smcli Image_Deactivate -T $userId -f IMMED");
$out = `ssh $::SUDOER\@$hcp "$::SUDO $::DIR/smcli Image_Deactivate -T $userId"`;
xCAT::zvmUtils->printSyslog("smcli Image_Deactivate -T $userId");
xCAT::zvmUtils->printLn( $callback, "$node: $out" );
# Wait for output
@@ -3606,8 +3606,8 @@ sub cloneVM {
}
}
$out = `ssh $::SUDOER\@$srcHcp "$::SUDO $::DIR/smcli Image_Deactivate -T $sourceId -f IMMED"`;
xCAT::zvmUtils->printSyslog("smcli Image_Deactivate -T $sourceId -f IMMED");
$out = `ssh $::SUDOER\@$srcHcp "$::SUDO $::DIR/smcli Image_Deactivate -T $sourceId"`;
xCAT::zvmUtils->printSyslog("smcli Image_Deactivate -T $sourceId");
xCAT::zvmUtils->printSyslog("$out");
#*** Clone source node ***