From d8539882a95c7e4cd590f376410576e6496f544e Mon Sep 17 00:00:00 2001 From: kishan Date: Fri, 20 Apr 2012 16:01:58 +0530 Subject: [PATCH] bug CS-14576: Fail 2.2.14 to 3.0.0 upgrade if encryption is not enabled status CS-14576: resolved fixed reviewed-by: Nitin Conflicts: server/src/com/cloud/upgrade/dao/Upgrade2214to30.java --- server/src/com/cloud/upgrade/dao/Upgrade2214to30.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java index b0ce9b8e54e..e752502db33 100755 --- a/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java +++ b/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java @@ -28,6 +28,8 @@ import org.apache.log4j.Logger; import com.cloud.offering.NetworkOffering; import com.cloud.utils.crypt.DBEncryptionUtil; +import com.cloud.utils.crypt.EncryptionSecretKeyChecker; + import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; @@ -61,6 +63,11 @@ public class Upgrade2214to30 implements DbUpgrade { @Override public void performDataMigration(Connection conn) { + // Fail upgrade if encryption is not enabled + if(!EncryptionSecretKeyChecker.useEncryption()){ + throw new CloudRuntimeException("Encryption is not enabled. Please Run cloud-setup-encryption to enable encryption"); + } + // physical network setup setupPhysicalNetworks(conn); // encrypt data