etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix description of addcluster api, and a typo in one script

This commit is contained in:
Edison Su 2011-08-01 14:28:34 -07:00
parent ae8e7cdeb1
commit 0bc6026d6b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/com/cloud/api/commands/AddClusterCmd.java
View File

@ -58,10 +58,10 @@ public class AddClusterCmd extends BaseCmd {
@Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, required=true, description="the Zone ID for the cluster")
private Long zoneId;
@Parameter(name=ApiConstants.HYPERVISOR, type=CommandType.STRING, required=true, description="hypervisor type of the cluster")
@Parameter(name=ApiConstants.HYPERVISOR, type=CommandType.STRING, required=true, description="hypervisor type of the cluster: XenServer,KVM,VMware,Hyperv,BareMetal,Simulator")
private String hypervisor;
@Parameter(name=ApiConstants.CLUSTER_TYPE, type=CommandType.STRING, required=true, description="hypervisor type of the cluster")
@Parameter(name=ApiConstants.CLUSTER_TYPE, type=CommandType.STRING, required=true, description="type of the cluster: CloudManaged, ExternalManaged")
private String clusterType;
@Parameter(name=ApiConstants.ALLOCATION_STATE, type=CommandType.STRING, description="Allocation state of this cluster for allocation of new resources")

6
scripts/vm/hypervisor/kvm/rundomrpre.sh
View File

@ -23,7 +23,7 @@
# $Id: rundomrpre.sh 10427 2010-07-09 03:30:48Z edison $ $HeadURL: svn://svn.lab.vmops.com/repos/vmdev/java/scripts/vm/hypervisor/kvm/rundomrpre.sh $
set -x
cert="/root/.ssh/id_rsa.cloud"
pubKey="/root/.ssh/id_rsa.pub.cloud"
mntpath() {
local vmname=$1
if [ ! -d /mnt/$vmname ]
@ -87,9 +87,9 @@ patch_all() {
local datadisk=$3
local path=$(mntpath $vmname)
if [ -f $cert ]
if [ -f $pubKey ]
then
cp $cert $path/authorized_keys
cp $pubKey $path/authorized_keys
fi
echo $cmdline > $path/cmdline
sed -i "s/,/\ /g" $path/cmdline