Updated Branches: refs/heads/4.2 7b728cdb7 -> 782333e14
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 <t...@apache.org> (cherry picked from commit 0edd2a8e14482def0d2a73726b53dee4239e2822) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/782333e1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/782333e1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/782333e1 Branch: refs/heads/4.2 Commit: 782333e14c2d5190ac7f4b30f1da6a2692dfc9c1 Parents: 7b728cd Author: Prasanna Santhanam <t...@apache.org> Authored: Fri Jul 26 19:20:29 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Fri Jul 26 19:39:37 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/782333e1/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..18cdb68 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
