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

Changes after review

Browse Source
This commit is contained in:
Mark Gurevich
2016-10-06 13:00:44 -04:00
parent 4f686ebc9e
commit 1e3ce72f09
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/guides/admin-guides/references/man1/mkvm.1.rst
View File

@@ -55,7 +55,7 @@ For KVM:
\ **mkvm**\ \ *noderange*\ [\ **-s|-**\ **-size**\ \ *disksize*\ ] [\ **-**\ **-mem**\ \ *memsize*\ ] [\ **-**\ **-cpus**\ \ *cpucount*\ ] [\ **-f|-**\ **-force**\ ]
For Vmware:
For VMware:
===========
@@ -99,7 +99,7 @@ With option \ *full*\ , a partition using all the resources on a normal power ma
If no option is specified, a partition using the parameters specified with attributes such as 'vmcpus', 'vmmory', 'vmphyslots', 'vmothersetting', 'vmnics', 'vmstorage' will be created. Those attributes can either be specified with '\*def' commands running before or be specified with this command.
For KVM and Vmware:
For KVM and VMware:
===================

4
xCAT-client/pods/man1/mkvm.1.pod
View File

@@ -28,7 +28,7 @@ B<mkvm> I<noderange> [B<vmcpus=> I<min/req/max>] [B<vmmemory=> I<min/req/max>] [
B<mkvm> I<noderange> [B<-s|--size> I<disksize>] [B<--mem> I<memsize>] [B<--cpus> I<cpucount>] [B<-f|--force>]
=head2 For Vmware:
=head2 For VMware:
B<mkvm> I<noderange> [B<-s>|B<--size> I<disksize>] [B<--mem> I<memsize>] [B<--cpus> I<cpucount>]
@@ -56,7 +56,7 @@ With option I<full>, a partition using all the resources on a normal power machi
If no option is specified, a partition using the parameters specified with attributes such as 'vmcpus', 'vmmory', 'vmphyslots', 'vmothersetting', 'vmnics', 'vmstorage' will be created. Those attributes can either be specified with '*def' commands running before or be specified with this command.
=head2 For KVM and Vmware:
=head2 For KVM and VMware:
The B<mkvm> command creates new virtual machine(s) with the I<disksize> size of hard disk, I<memsize> size of memory and I<cpucount> number of cpu.

4
xCAT-server/lib/xcat/plugins/kvm.pm
View File

@@ -1761,7 +1761,7 @@ sub rmvm {
} else {
$currxml = $confdata->{kvmnodedata}->{$node}->[0]->{xml};
unless ($currxml) {
xCAT::SvrUtils::sendmsg([ 1, "Cannot remove guest, no such vm" ], $callback, $node);
xCAT::SvrUtils::sendmsg([ 1, "Cannot remove guest vm, no such vm found" ], $callback, $node);
return;
}
}
@@ -3053,7 +3053,7 @@ sub mkvm {
};
if ($@) {
if ($@ =~ /Path (\S+) already exists at /) {
return 1, "Storage creation request conflicts with existing file(s) $1 (use mkvm with -f argument to remove)";
return 1, "Storage creation request conflicts with existing file(s) $1. To force remove the existing storage file, rerun mkvm with the -f option.";
} else {
return 1, "Unknown issue $@";