apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.11'

Browse Source
This commit is contained in:
Rohit Yadav 2018-09-21 14:21:28 +05:30
commit 9c14059d9e
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java
View File

@ -57,11 +57,10 @@ public class MigrateNetworkCmd extends BaseAsyncCmd {
//////////////// API parameters ///////////////////// //////////////// API parameters /////////////////////
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
@ACL(accessType = AccessType.OperateEntry) @ACL(accessType = AccessType.OperateEntry)
@Parameter(name=ApiConstants.NETWORK_ID, type=CommandType.UUID, entityType = NetworkResponse.class, @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, required = true, description = "the ID of the network")
required=true, description="the ID of the network")
protected Long id; protected Long id;
@Parameter(name = ApiConstants.NETWORK_OFFERING_ID, type = CommandType.UUID, entityType = NetworkOfferingResponse.class, description = "network offering ID") @Parameter(name = ApiConstants.NETWORK_OFFERING_ID, type = CommandType.UUID, entityType = NetworkOfferingResponse.class, required = true, description = "network offering ID")
private Long networkOfferingId; private Long networkOfferingId;
@Parameter(name = ApiConstants.RESUME, type = CommandType.BOOLEAN, description = "true if previous network migration cmd failed") @Parameter(name = ApiConstants.RESUME, type = CommandType.BOOLEAN, description = "true if previous network migration cmd failed")

12
engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41110to41120.java
View File

@ -135,12 +135,12 @@ public class Upgrade41110to41120 implements DbUpgrade {
final Map<Hypervisor.HypervisorType, String> newTemplateChecksum = new HashMap<Hypervisor.HypervisorType, String>() { final Map<Hypervisor.HypervisorType, String> newTemplateChecksum = new HashMap<Hypervisor.HypervisorType, String>() {
{ {
put(Hypervisor.HypervisorType.KVM, "f44242570ae4a0b16c4c2eb2cb71fe45"); put(Hypervisor.HypervisorType.KVM, "6d12cc764cd7d64112d8c35d70923eb1");
put(Hypervisor.HypervisorType.XenServer, "afcc31ab9f7635885cd83600eafbbe7f"); put(Hypervisor.HypervisorType.XenServer, "6e8b3ae84ca8145736d1d7d3f7546e65");
put(Hypervisor.HypervisorType.VMware, "54449e31530f14af930c80a3155a308f"); put(Hypervisor.HypervisorType.VMware, "e981f8cb951688efd93481913198c9cc");
put(Hypervisor.HypervisorType.Hyperv, "7785df30fdbbacdead5acbfc15ae2c98"); put(Hypervisor.HypervisorType.Hyperv, "e9032635ffba021371780307162551b9");
put(Hypervisor.HypervisorType.LXC, "f44242570ae4a0b16c4c2eb2cb71fe45"); put(Hypervisor.HypervisorType.LXC, "6d12cc764cd7d64112d8c35d70923eb1");
put(Hypervisor.HypervisorType.Ovm3, "81a6cd8d07fad910824f040f73ce03e3"); put(Hypervisor.HypervisorType.Ovm3, "c4a91f8e52e4531a1c2a9a17c530d5fe");
} }
}; };

6
systemvm/debian/opt/cloud/bin/setup/cloud-early-config
View File

@ -150,6 +150,10 @@ get_boot_params() {
esac esac
} }
get_systemvm_type() {
export TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
}
patch() { patch() {
local PATCH_MOUNT=/media/cdrom local PATCH_MOUNT=/media/cdrom
local patchfile=$PATCH_MOUNT/cloud-scripts.tgz local patchfile=$PATCH_MOUNT/cloud-scripts.tgz
@ -216,11 +220,11 @@ start() {
config_guest config_guest
get_boot_params get_boot_params
get_systemvm_type
patch patch
sync sync
sysctl -p sysctl -p
export TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
log_it "Configuring systemvm type=$TYPE" log_it "Configuring systemvm type=$TYPE"
if [ -f "/opt/cloud/bin/setup/$TYPE.sh" ]; then if [ -f "/opt/cloud/bin/setup/$TYPE.sh" ]; then

2
systemvm/debian/opt/cloud/bin/setup/postinit.sh
View File

@ -21,7 +21,7 @@
# Eject cdrom if any # Eject cdrom if any
eject || true eject || true
TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE) TYPE=$(grep -Po 'type=\K[a-zA-Z]*' /var/cache/cloud/cmdline)
if [ "$TYPE" == "router" ] || [ "$TYPE" == "vpcrouter" ] || [ "$TYPE" == "dhcpsrvr" ] if [ "$TYPE" == "router" ] || [ "$TYPE" == "vpcrouter" ] || [ "$TYPE" == "dhcpsrvr" ]
then then
if [ -x /opt/cloud/bin/update_config.py ] if [ -x /opt/cloud/bin/update_config.py ]

2
tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
View File

@ -19,7 +19,7 @@
set -e set -e
set -x set -x
CLOUDSTACK_RELEASE=4.11.1 CLOUDSTACK_RELEASE=4.11.2
function configure_apache2() { function configure_apache2() {
# Enable ssl, rewrite and auth # Enable ssl, rewrite and auth