mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Conflicts: agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java api/src/com/cloud/agent/api/to/FirewallRuleTO.java api/src/com/cloud/agent/api/to/IpAddressTO.java api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java api/src/com/cloud/api/ApiConstants.java api/src/com/cloud/api/BaseCmd.java api/src/com/cloud/api/ResponseGenerator.java api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java api/src/com/cloud/api/commands/ListCapabilitiesCmd.java api/src/com/cloud/api/commands/UpdateNetworkCmd.java api/src/com/cloud/api/response/CapabilitiesResponse.java api/src/com/cloud/network/Network.java api/src/com/cloud/network/NetworkService.java api/src/com/cloud/network/firewall/FirewallService.java api/src/com/cloud/network/lb/LoadBalancingRule.java api/src/com/cloud/network/lb/LoadBalancingRulesService.java api/src/com/cloud/network/rules/FirewallRule.java api/src/com/cloud/network/rules/RulesService.java api/src/com/cloud/offering/NetworkOffering.java client/tomcatconf/commands.properties.in cloud.spec core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java core/src/com/cloud/storage/template/DownloadManagerImpl.java core/src/com/cloud/vm/DomainRouterVO.java debian/cloud-deps.install patches/systemvm/debian/config/etc/init.d/cloud-early-config patches/systemvm/debian/config/root/ipassoc.sh patches/systemvm/debian/config/root/loadbalancer.sh scripts/vm/hypervisor/kvm/rundomrpre.sh scripts/vm/hypervisor/xenserver/vmops server/src/com/cloud/agent/manager/AgentAttache.java server/src/com/cloud/agent/manager/AgentManagerImpl.java server/src/com/cloud/agent/manager/AgentMonitor.java server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java server/src/com/cloud/alert/ClusterAlertAdapter.java server/src/com/cloud/api/ApiResponseHelper.java server/src/com/cloud/api/ApiServer.java server/src/com/cloud/cluster/ClusterManagerImpl.java server/src/com/cloud/configuration/Config.java server/src/com/cloud/configuration/ConfigurationManager.java server/src/com/cloud/configuration/ConfigurationManagerImpl.java server/src/com/cloud/configuration/DefaultComponentLibrary.java server/src/com/cloud/deploy/FirstFitPlanner.java server/src/com/cloud/ha/HighAvailabilityManagerImpl.java server/src/com/cloud/host/dao/HostDaoImpl.java server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java server/src/com/cloud/network/LoadBalancerVO.java server/src/com/cloud/network/NetworkManager.java server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/dao/FirewallRulesDao.java server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java server/src/com/cloud/network/element/DhcpElement.java server/src/com/cloud/network/element/VirtualRouterElement.java server/src/com/cloud/network/firewall/FirewallManagerImpl.java server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/src/com/cloud/network/rules/FirewallManager.java server/src/com/cloud/network/rules/FirewallRuleVO.java server/src/com/cloud/network/rules/PortForwardingRuleVO.java server/src/com/cloud/network/rules/RulesManagerImpl.java server/src/com/cloud/network/rules/StaticNatRuleImpl.java server/src/com/cloud/network/security/SecurityGroupListener.java server/src/com/cloud/network/security/SecurityGroupManagerImpl.java server/src/com/cloud/offerings/NetworkOfferingVO.java server/src/com/cloud/server/ConfigurationServerImpl.java server/src/com/cloud/server/ManagementServerImpl.java server/src/com/cloud/storage/StorageManager.java server/src/com/cloud/storage/StorageManagerImpl.java server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java server/src/com/cloud/storage/download/DownloadMonitorImpl.java server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java server/src/com/cloud/upgrade/dao/Upgrade228to229.java server/src/com/cloud/upgrade/dao/Upgrade229to2210.java server/src/com/cloud/user/AccountManagerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java server/src/com/cloud/vm/VirtualMachineManagerImpl.java server/src/com/cloud/vm/dao/DomainRouterDao.java server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java setup/db/create-index-fk.sql setup/db/create-schema.sql setup/db/db/schema-222to224.sql setup/db/db/schema-227to228.sql setup/db/db/schema-228to229.sql setup/db/db/schema-229to2210.sql tools/testClient/README ui/scripts/cloud.core.instance.js utils/src/com/cloud/utils/SerialVersionUID.java utils/src/com/cloud/utils/db/ConnectionConcierge.java utils/src/com/cloud/utils/db/Merovingian2.java utils/src/com/cloud/utils/db/Transaction.java utils/src/com/cloud/utils/nio/Link.java utils/src/com/cloud/utils/nio/NioConnection.java utils/src/com/cloud/utils/time/InaccurateClock.java
145 lines
2.8 KiB
Bash
Executable File
145 lines
2.8 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
|
|
|
|
#
|
|
# Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
|
|
#
|
|
# This software is licensed under the GNU General Public License v3 or later.
|
|
#
|
|
# It is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or any later version.
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
#
|
|
|
|
|
|
# $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
|
|
pubKey="/root/.ssh/id_rsa.pub.cloud"
|
|
mntpath() {
|
|
local vmname=$1
|
|
if [ ! -d /mnt/$vmname ]
|
|
then
|
|
mkdir -p /mnt/$vmname
|
|
fi
|
|
echo "/mnt/$vmname"
|
|
}
|
|
|
|
mount_raw_disk() {
|
|
local vmname=$1
|
|
local datadisk=$2
|
|
local path=$(mntpath $vmname)
|
|
if [ ! -f $datadisk ]
|
|
then
|
|
printf "$datadisk doesn't exist" >&2
|
|
return 2
|
|
fi
|
|
|
|
retry=10
|
|
while [ $retry -gt 0 ]
|
|
do
|
|
mount $datadisk $path -o loop &>/dev/null
|
|
sleep 10
|
|
if [ $? -gt 0 ]
|
|
then
|
|
sleep 5
|
|
else
|
|
break
|
|
fi
|
|
retry=$(($retry-1))
|
|
done
|
|
return 0
|
|
}
|
|
|
|
umount_raw_disk() {
|
|
local vmname=$1
|
|
local datadisk=$2
|
|
local path=$(mntpath $vmname)
|
|
|
|
retry=10
|
|
sync
|
|
while [ $retry -gt 0 ]
|
|
do
|
|
umount $path &>/dev/null
|
|
if [ $? -gt 0 ]
|
|
then
|
|
sleep 5
|
|
else
|
|
rm -rf $path
|
|
break
|
|
fi
|
|
retry=$(($retry-1))
|
|
done
|
|
return $?
|
|
}
|
|
|
|
patch_all() {
|
|
local vmname=$1
|
|
local cmdline=$2
|
|
local datadisk=$3
|
|
local path=$(mntpath $vmname)
|
|
|
|
|
|
if [ -f $pubKey ]
|
|
then
|
|
cp $pubKey $path/authorized_keys
|
|
fi
|
|
echo $cmdline > $path/cmdline
|
|
sed -i "s/,/\ /g" $path/cmdline
|
|
return 0
|
|
}
|
|
|
|
lflag=
|
|
dflag=
|
|
|
|
while getopts 't:v:i:m:e:E:a:A:g:l:n:d:b:B:p:I:N:Mx:X:' OPTION
|
|
do
|
|
case $OPTION in
|
|
l) lflag=1
|
|
vmname="$OPTARG"
|
|
;;
|
|
t) tflag=1
|
|
vmtype="$OPTARG"
|
|
;;
|
|
d) dflag=1
|
|
rootdisk="$OPTARG"
|
|
;;
|
|
p) pflag=1
|
|
cmdline="$OPTARG"
|
|
;;
|
|
*) ;;
|
|
esac
|
|
done
|
|
|
|
if [ "$lflag$tflag$dflag" != "111" ]
|
|
then
|
|
printf "Error: No enough parameter\n" >&2
|
|
exit 1
|
|
fi
|
|
|
|
if [ "$vmtype" = "all" ]
|
|
then
|
|
mount_raw_disk $vmname $rootdisk
|
|
if [ $? -gt 0 ]
|
|
then
|
|
printf "Failed to mount $rootdisk"
|
|
exit $?
|
|
fi
|
|
|
|
patch_all $vmname $cmdline $rootdisk
|
|
|
|
umount_raw_disk $vmname $rootdisk
|
|
exit $?
|
|
fi
|
|
|
|
|
|
exit $?
|