You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/11/26 15:03:14 UTC
[1/3] git commit: updated refs/heads/master to 8b237eb
Updated Branches:
refs/heads/master b2f0a0bce -> 8b237eb0a
CLOUDSTACK-5272: return unlimit if max.account.* or max.project.* is set to negative
(cherry picked from commit 888ddd724aabbd22d675fe2bba873971888e1a8a)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e0fbc3f1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e0fbc3f1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e0fbc3f1
Branch: refs/heads/master
Commit: e0fbc3f14753a9d596dc0a23ec1758603b01e322
Parents: b2f0a0b
Author: Wei Zhou <w....@leaseweb.com>
Authored: Tue Nov 26 14:05:18 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Tue Nov 26 14:43:23 2013 +0100
----------------------------------------------------------------------
.../src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e0fbc3f1/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
index 9b46627..ed4c480 100755
--- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
+++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -283,6 +283,9 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
value = accountResourceLimitMap.get(type);
}
if (value != null) {
+ if (value < 0) { // return unlimit if value is set to negative
+ return max;
+ }
// convert the value from GiB to bytes in case of primary or secondary storage.
if (type == ResourceType.primary_storage || type == ResourceType.secondary_storage) {
value = value * ResourceType.bytesToGiB;
@@ -316,6 +319,9 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
value = accountResourceLimitMap.get(type);
}
if (value != null) {
+ if (value < 0) { // return unlimit if value is set to negative
+ return max;
+ }
if (type == ResourceType.primary_storage || type == ResourceType.secondary_storage) {
value = value * ResourceType.bytesToGiB;
}
[2/3] git commit: updated refs/heads/master to 8b237eb
Posted by we...@apache.org.
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 <w....@leaseweb.com>
Authored: Tue Nov 26 15:01:23 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
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");
[3/3] git commit: updated refs/heads/master to 8b237eb
Posted by we...@apache.org.
CLOUDSTACK-4505: allow domain admin to expunge a destroyed VM
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8b237eb0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8b237eb0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8b237eb0
Branch: refs/heads/master
Commit: 8b237eb0a2360ba8aaba798a8febab8ceb5477cb
Parents: 9be402c
Author: Wei Zhou <w....@leaseweb.com>
Authored: Tue Nov 26 15:02:44 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Tue Nov 26 15:02:44 2013 +0100
----------------------------------------------------------------------
client/tomcatconf/commands.properties.in | 2 +-
ui/scripts/instances.js | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b237eb0/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index cb9dcf0..28490a9 100644
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -71,7 +71,7 @@ assignVirtualMachine=7
migrateVirtualMachine=1
migrateVirtualMachineWithVolume=1
recoverVirtualMachine=7
-expungeVirtualMachine=1
+expungeVirtualMachine=7
#### snapshot commands
createSnapshot=15
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b237eb0/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 71c5a32..06acc16 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1765,7 +1765,7 @@
else if (isAdmin())
jsonObj = $.extend(args.context.instances[0], {
state: "Expunged"
- }); //after root admin expunge a VM, listVirtualMachines API will no longer returns this expunged VM to all users.
+ }); //after root/domain admin expunge a VM, listVirtualMachines API will no longer returns this expunged VM to all users.
else
jsonObj = $.extend(args.context.instances[0], {
state: "Destroyed"
@@ -2101,7 +2101,7 @@
if (isAdmin() || isDomainAdmin()) {
allowedActions.push("restore");
}
- if (isAdmin())
+ if (isAdmin() || isDomainAdmin())
allowedActions.push("expunge");
} else if (jsonObj.state == 'Running') {
allowedActions.push("stop");
@@ -2161,7 +2161,7 @@
} else if (jsonObj.state == 'Error') {
allowedActions.push("destroy");
} else if (jsonObj.state == 'Expunging') {
- if (isAdmin())
+ if (isAdmin() || isDomainAdmin())
allowedActions.push("expunge");
}
return allowedActions;