Repository: cloudstack Updated Branches: refs/heads/4.4 fe7ecad20 -> 9c572eeae
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<nitin.me...@citrix.com> (cherry picked from commit 05802004e27f91f4c23274ca123f1ecf9fde5ac2) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9c572eea Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9c572eea Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9c572eea Branch: refs/heads/4.4 Commit: 9c572eeae133f128b6158f8df64b0b7a6bd64e9f Parents: fe7ecad Author: Amogh Vasekar <amogh.vase...@citrix.com> Authored: Fri Apr 25 14:48:15 2014 -0700 Committer: Daan Hoogland <d...@onecht.net> Committed: Sat Apr 26 13:42:09 2014 +0200 ---------------------------------------------------------------------- server/src/com/cloud/server/ConfigurationServerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c572eea/server/src/com/cloud/server/ConfigurationServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index 4781010..ac0fe5e 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.");
