cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: updated refs/heads/master to 4be18ae
Date Fri, 26 Jul 2013 14:12:43 GMT
Updated Branches:
  refs/heads/master 32c8cd3cd -> 4be18aefc


CLOUDSTACK-2450: Fix userdata to be urlencoded safely

urlencoding the userdata and quoting the = since apiserver will strip
them out. This will send an invalid userdata down to the plugin (vmops)
where base64 decoding fails causing vm deployment to fail.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4be18aef
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4be18aef
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4be18aef

Branch: refs/heads/master
Commit: 4be18aefc4b8fa7a4b184ace7007159f728df827
Parents: 32c8cd3
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Fri Jul 26 19:20:29 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Fri Jul 26 19:40:22 2013 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/integration/lib/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4be18aef/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index 8d9a25d..d927c2a 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -376,7 +376,7 @@ class VirtualMachine:
             cmd.hostid = hostid
 
         if "userdata" in services:
-            cmd.userdata = base64.b64encode(services["userdata"])
+            cmd.userdata = base64.urlsafe_b64encode(services["userdata"])
 
         if group:
             cmd.group = group


Mime
View raw message