From 6ce01c46fc73a2753e540130bdce194a3ce57dea Mon Sep 17 00:00:00 2001 From: Isaac Chiang Date: Wed, 2 Jan 2013 10:50:06 +0800 Subject: [PATCH 1/5] UI: add generate key button to appropriate roles --- client/tomcatconf/commands.properties.in | 2 +- ui/scripts/accounts.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index e55017ce5ea..27e0c2fc3cf 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -260,7 +260,7 @@ migrateVolume=com.cloud.api.commands.MigrateVolumeCmd;15 #### use that key...the key is stored in the db associated w/ #### the userId...every request to the developer API should be #### checked against the key -registerUserKeys=com.cloud.api.commands.RegisterCmd;1 +registerUserKeys=com.cloud.api.commands.RegisterCmd;15 ### async-query command queryAsyncJobResult=com.cloud.api.commands.QueryAsyncJobResultCmd;15 diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js index ba741a4f063..de8149fe877 100644 --- a/ui/scripts/accounts.js +++ b/ui/scripts/accounts.js @@ -1282,6 +1282,7 @@ } else { if(isSelfOrChildDomainUser(jsonObj.username, jsonObj.accounttype, jsonObj.domainid, jsonObj.iscallerchilddomain)) { allowedActions.push("changePassword"); + allowedActions.push("generateKeys"); } } return allowedActions; From 9c5c626546b414c6990fef8b04291c1a28264559 Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Thu, 3 Jan 2013 17:26:26 -0700 Subject: [PATCH 2/5] Summary: bring up KVM network bridge immediately Detail: Users can experience long delays during VM migration, because the linux bridge by default will have a forwarding delay set. This means that the network will likely miss any gratuitous ARP from qemu notifying the network that the MAC has moved. This change is a common reccommendation for virtualization running on Linux bridges. Signed-off-by: Marcus Sorensen 1357259186 -0700 --- scripts/vm/network/vnet/modifyvlan.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/vm/network/vnet/modifyvlan.sh b/scripts/vm/network/vnet/modifyvlan.sh index 5577825ea54..8ed3905a579 100755 --- a/scripts/vm/network/vnet/modifyvlan.sh +++ b/scripts/vm/network/vnet/modifyvlan.sh @@ -67,6 +67,8 @@ addVlan() { return 2 fi fi + + brctl setfd $vlanBr 0 fi #pif is eslaved into vlanBr? From 8cf2cb1f4e9b09041782678640d46ddc46ef4ba4 Mon Sep 17 00:00:00 2001 From: Gavin Lee Date: Fri, 4 Jan 2013 10:25:34 +0800 Subject: [PATCH 3/5] [DOC]Delete duplicated, mis-spelling xml files. --- .../changing-secondary-storage-servers.xml | 2 +- .../changing-secondary-storage-serversp.xml | 36 ------------------- docs/en-US/configure-xenserver-dom-memory.xml | 29 --------------- 3 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 docs/en-US/changing-secondary-storage-serversp.xml delete mode 100644 docs/en-US/configure-xenserver-dom-memory.xml diff --git a/docs/en-US/changing-secondary-storage-servers.xml b/docs/en-US/changing-secondary-storage-servers.xml index 62ad65015a3..a628eec9b39 100644 --- a/docs/en-US/changing-secondary-storage-servers.xml +++ b/docs/en-US/changing-secondary-storage-servers.xml @@ -22,7 +22,7 @@ under the License. --> -
+
Changing Secondary Storage Servers You can change the secondary storage NFS mount. Perform the following steps to do so: diff --git a/docs/en-US/changing-secondary-storage-serversp.xml b/docs/en-US/changing-secondary-storage-serversp.xml deleted file mode 100644 index 62ad65015a3..00000000000 --- a/docs/en-US/changing-secondary-storage-serversp.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -%BOOK_ENTITIES; -]> - - - -
- Changing Secondary Storage Servers - You can change the secondary storage NFS mount. Perform the following steps to do so: - - Stop all running Management Servers. - Wait 30 minutes. This allows any writes to secondary storage to complete. - Copy all files from the old secondary storage mount to the new. - Use the procedure above to change the IP address for secondary storage if required. - Start the Management Server. - -
- diff --git a/docs/en-US/configure-xenserver-dom-memory.xml b/docs/en-US/configure-xenserver-dom-memory.xml deleted file mode 100644 index 0a02d3e3818..00000000000 --- a/docs/en-US/configure-xenserver-dom-memory.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -%BOOK_ENTITIES; -]> - - - -
- Configure XenServer dom0 Memory - Configure the XenServer dom0 settings to allocate more memory to dom0. This can enable XenServer to handle larger numbers of virtual machines. We recommend 2940 MB of RAM for XenServer dom0. For instructions on how to do this, see Citrix Knowledgebase Article.The article refers to XenServer 5.6, but the same information applies to XenServer 6 -
- From 287d7f4df0d0898656eca00b6b6fa43fd3b2eb43 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Fri, 28 Dec 2012 16:17:16 -0800 Subject: [PATCH 4/5] marvin tests: marking the xen specific tests these tests do verification assuming xenserver style disks /dev/xvda/b Signed-off-by: Prasanna Santhanam --- test/integration/component/test_snapshots.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py index 8659f14309a..825b8c6877e 100644 --- a/test/integration/component/test_snapshots.py +++ b/test/integration/component/test_snapshots.py @@ -582,7 +582,7 @@ class TestSnapshots(cloudstackTestCase): return @attr(speed = "slow") - @attr(tags = ["advanced", "advancedns", "smoke"]) + @attr(tags = ["advanced", "advancedns", "smoke", "xen"]) def test_03_volume_from_snapshot(self): """Create volumes from snapshots """ @@ -995,7 +995,7 @@ class TestSnapshots(cloudstackTestCase): return @attr(speed = "slow") - @attr(tags = ["advanced", "advancedns", "smoke"]) + @attr(tags = ["advanced", "advancedns", "smoke", "xen"]) def test_07_template_from_snapshot(self): """Create Template from snapshot """ @@ -1901,7 +1901,7 @@ class TestSnapshotDetachedDisk(cloudstackTestCase): return @attr(speed = "slow") - @attr(tags = ["advanced", "advancedns"]) + @attr(tags = ["advanced", "advancedns", "xen"]) def test_03_snapshot_detachedDisk(self): """Test snapshot from detached disk """ From 42f3804fbdde7bfe4f3676ef0c18a54dfe95354c Mon Sep 17 00:00:00 2001 From: Noa Resare Date: Thu, 3 Jan 2013 15:48:06 +0000 Subject: [PATCH 5/5] Work around maven dependency problems Disable the transitive dependency from axis2-webapp to xercesImpl and from all rampart artifacts to opensaml. This fixes reproducible problem where maven tries to download artifacts from the wrong repositories. Signed-off-by: Prasanna Santhanam Signed-off-by: Rohit Yadav Reviewed-by: Likitha Shetty --- awsapi/pom.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/awsapi/pom.xml b/awsapi/pom.xml index 2e426550afa..06c9d7e058a 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -47,6 +47,12 @@ axis2-webapp war ${cs.axis2.version} + + + xerces + xercesImpl + + org.apache.ws.commons.axiom @@ -123,6 +129,10 @@ org.apache.xalan xalan + + org.opensaml + opensaml + @@ -139,6 +149,10 @@ org.apache.xalan xalan + + org.opensaml + opensaml + @@ -151,6 +165,10 @@ org.apache.xalan xalan + + org.opensaml + opensaml + @@ -163,6 +181,10 @@ org.apache.xalan xalan + + org.opensaml + opensaml + @@ -175,6 +197,10 @@ org.apache.xalan xalan + + org.opensaml + opensaml +