CLOUDSTACK-2940: Allowing Replacement of realhostip.com with a customized
domain for SSVM
(cherry picked from commit e23b10319f55fe8cbb822c0c29dc64b56509c119)
Conflicts:
plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
server/src/com/cloud/storage/upload/UploadMonitorImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9be402cb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9be402cb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9be402cb
Branch: refs/heads/master
Commit: 9be402cb0693d8aeb779aa7f5ccbe7070c2f03de
Parents: e0fbc3f
Author: Wei Zhou <[email protected]>
Authored: Tue Nov 26 15:01:23 2013 +0100
Committer: Wei Zhou <[email protected]>
Committed: Tue Nov 26 15:01:23 2013 +0100
----------------------------------------------------------------------
.../datastore/driver/CloudStackImageStoreDriverImpl.java | 7 ++++++-
.../src/com/cloud/storage/download/DownloadMonitorImpl.java | 2 +-
server/src/com/cloud/storage/upload/UploadMonitorImpl.java | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9be402cb/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
----------------------------------------------------------------------
diff --git
a/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
b/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
index 0450a7a..1db10e2 100644
---
a/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
+++
b/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
@@ -89,12 +89,17 @@ public class CloudStackImageStoreDriverImpl extends
BaseImageStoreDriverImpl {
String scheme = "http";
boolean _sslCopy = false;
String sslCfg =
_configDao.getValue(Config.SecStorageEncryptCopy.toString());
+ String _ssvmUrlDomain =
_configDao.getValue("secstorage.ssl.cert.domain");
if (sslCfg != null) {
_sslCopy = Boolean.parseBoolean(sslCfg);
}
if (_sslCopy) {
hostname = ipAddress.replace(".", "-");
- hostname = hostname + ".realhostip.com";
+ if(_ssvmUrlDomain != null && _ssvmUrlDomain.length() > 0){
+ hostname = hostname + "." + _ssvmUrlDomain;
+ } else {
+ hostname = hostname + ".realhostip.com";
+ }
scheme = "https";
}
return scheme + "://" + hostname + "/userdata/" + uuid;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9be402cb/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
index 86e5792..d900333 100755
--- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
+++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
@@ -106,7 +106,7 @@ public class DownloadMonitorImpl extends ManagerBase
implements DownloadMonitor
@Override
public boolean configure(String name, Map<String, Object> params) {
- final Map<String, String> configs =
_configDao.getConfiguration("ManagementServer", params);
+ final Map<String, String> configs =
_configDao.getConfiguration("management-server", params);
_sslCopy =
Boolean.parseBoolean(configs.get("secstorage.encrypt.copy"));
_proxy = configs.get(Config.SecStorageProxy.key());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9be402cb/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
index 5d491c3..991f35f 100755
--- a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
+++ b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
@@ -380,7 +380,7 @@ public class UploadMonitorImpl extends ManagerBase
implements UploadMonitor {
@Override
public boolean configure(String name, Map<String, Object> params) throws
ConfigurationException {
- final Map<String, String> configs =
_configDao.getConfiguration("ManagementServer", params);
+ final Map<String, String> configs =
_configDao.getConfiguration("management-server", params);
_sslCopy =
Boolean.parseBoolean(configs.get("secstorage.encrypt.copy"));
String cert = configs.get("secstorage.secure.copy.cert");
