From 8da25139b8ca13e37db640940d16e8202cf05d8f Mon Sep 17 00:00:00 2001 From: Kris Sterckx Date: Thu, 20 Sep 2018 12:19:00 +0200 Subject: [PATCH 1/2] api: Make networkofferingid required in migrateNetwork (#2852) MigrateNetwork API doesn't declare networkofferingid as required. Fixes #2851 --- .../api/command/admin/network/MigrateNetworkCmd.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java index 298d9b043e8..95ed1234cf9 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java @@ -57,11 +57,10 @@ public class MigrateNetworkCmd extends BaseAsyncCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// @ACL(accessType = AccessType.OperateEntry) - @Parameter(name=ApiConstants.NETWORK_ID, type=CommandType.UUID, entityType = NetworkResponse.class, - required=true, description="the ID of the network") + @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class, required = true, description = "the ID of the network") 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; @Parameter(name = ApiConstants.RESUME, type = CommandType.BOOLEAN, description = "true if previous network migration cmd failed") From 70dbfa7883b4fd161e06c7e80f1f874d12d6f69c Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 21 Sep 2018 14:19:18 +0530 Subject: [PATCH 2/2] systemvm: export $TYPE before patching ssvm/cpvm (#2855) This fixes a regression introduced in #2799, by exporting $TYPE before the `patch` is called to patch/extract archives for ssvm/cpvm. Signed-off-by: Rohit Yadav --- .../com/cloud/upgrade/dao/Upgrade41110to41120.java | 12 ++++++------ .../debian/opt/cloud/bin/setup/cloud-early-config | 6 +++++- systemvm/debian/opt/cloud/bin/setup/postinit.sh | 2 +- .../scripts/configure_systemvm_services.sh | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java index a35be45a8d9..d4bdc13b082 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java @@ -135,12 +135,12 @@ public class Upgrade41110to41120 implements DbUpgrade { final Map newTemplateChecksum = new HashMap() { { - put(Hypervisor.HypervisorType.KVM, "f44242570ae4a0b16c4c2eb2cb71fe45"); - put(Hypervisor.HypervisorType.XenServer, "afcc31ab9f7635885cd83600eafbbe7f"); - put(Hypervisor.HypervisorType.VMware, "54449e31530f14af930c80a3155a308f"); - put(Hypervisor.HypervisorType.Hyperv, "7785df30fdbbacdead5acbfc15ae2c98"); - put(Hypervisor.HypervisorType.LXC, "f44242570ae4a0b16c4c2eb2cb71fe45"); - put(Hypervisor.HypervisorType.Ovm3, "81a6cd8d07fad910824f040f73ce03e3"); + put(Hypervisor.HypervisorType.KVM, "6d12cc764cd7d64112d8c35d70923eb1"); + put(Hypervisor.HypervisorType.XenServer, "6e8b3ae84ca8145736d1d7d3f7546e65"); + put(Hypervisor.HypervisorType.VMware, "e981f8cb951688efd93481913198c9cc"); + put(Hypervisor.HypervisorType.Hyperv, "e9032635ffba021371780307162551b9"); + put(Hypervisor.HypervisorType.LXC, "6d12cc764cd7d64112d8c35d70923eb1"); + put(Hypervisor.HypervisorType.Ovm3, "c4a91f8e52e4531a1c2a9a17c530d5fe"); } }; diff --git a/systemvm/debian/opt/cloud/bin/setup/cloud-early-config b/systemvm/debian/opt/cloud/bin/setup/cloud-early-config index 2c277ae78ed..8ba7701de8a 100755 --- a/systemvm/debian/opt/cloud/bin/setup/cloud-early-config +++ b/systemvm/debian/opt/cloud/bin/setup/cloud-early-config @@ -150,6 +150,10 @@ get_boot_params() { esac } +get_systemvm_type() { + export TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE) +} + patch() { local PATCH_MOUNT=/media/cdrom local patchfile=$PATCH_MOUNT/cloud-scripts.tgz @@ -216,11 +220,11 @@ start() { config_guest get_boot_params + get_systemvm_type patch sync sysctl -p - export TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE) log_it "Configuring systemvm type=$TYPE" if [ -f "/opt/cloud/bin/setup/$TYPE.sh" ]; then diff --git a/systemvm/debian/opt/cloud/bin/setup/postinit.sh b/systemvm/debian/opt/cloud/bin/setup/postinit.sh index 5132d5e85d4..f0ae5e89f0c 100755 --- a/systemvm/debian/opt/cloud/bin/setup/postinit.sh +++ b/systemvm/debian/opt/cloud/bin/setup/postinit.sh @@ -21,7 +21,7 @@ # Eject cdrom if any 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" ] then if [ -x /opt/cloud/bin/update_config.py ] diff --git a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh index 7af9212e343..48695014bd9 100644 --- a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh +++ b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh @@ -19,7 +19,7 @@ set -e set -x -CLOUDSTACK_RELEASE=4.11.1 +CLOUDSTACK_RELEASE=4.11.2 function configure_apache2() { # Enable ssl, rewrite and auth