From 7694bee83f53a16537032bed3902ef8b4f95c4ab Mon Sep 17 00:00:00 2001 From: Amogh Vasekar Date: Fri, 25 Apr 2014 14:48:15 -0700 Subject: [PATCH] In 4.3, SSL was turned off by default. However, for SSVM, the value from configuration server overrides the default in Config.java. Work around is to change in global properties. Local testing, checking a fresh install has the above property false by default. Signed-off-by: Nitin Mehta (cherry picked from commit 05802004e27f91f4c23274ca123f1ecf9fde5ac2) --- server/src/com/cloud/server/ConfigurationServerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index 478101027cc..ac0fe5e12cd 100755 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -211,8 +211,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio _configDao.update(Config.UseSecondaryStorageVm.key(), Config.UseSecondaryStorageVm.getCategory(), "true"); s_logger.debug("ConfigurationServer made secondary storage vm required."); - _configDao.update(Config.SecStorageEncryptCopy.key(), Config.SecStorageEncryptCopy.getCategory(), "true"); - s_logger.debug("ConfigurationServer made secondary storage copy encrypted."); + _configDao.update(Config.SecStorageEncryptCopy.key(), Config.SecStorageEncryptCopy.getCategory(), "false"); + s_logger.debug("ConfigurationServer made secondary storage copy encrypt set to false."); _configDao.update("secstorage.secure.copy.cert", "realhostip"); s_logger.debug("ConfigurationServer made secondary storage copy use realhostip.");