You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/12/09 13:07:07 UTC
[1/2] git commit: updated refs/heads/master to ca12133
Repository: cloudstack
Updated Branches:
refs/heads/master 1a99c39da -> ca121336a
Add the Userdata setting to the UI on VM creation step
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/068e508e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/068e508e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/068e508e
Branch: refs/heads/master
Commit: 068e508e3baa92295788920f521b96eefd442796
Parents: 76bb54b
Author: Jean-Francois Vincent <Je...@atos.net>
Authored: Mon Dec 8 16:50:29 2014 +0100
Committer: Axel Delahaye <ax...@atos.net>
Committed: Tue Dec 9 11:32:49 2014 +0100
----------------------------------------------------------------------
client/WEB-INF/classes/resources/messages.properties | 1 +
ui/index.jsp | 10 ++++++++++
ui/scripts/instanceWizard.js | 7 +++++++
3 files changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/068e508e/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index edaad29..d2d5250 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -352,6 +352,7 @@ label.add.system.service.offering=Add System Service Offering
label.add.template=Add Template
label.add.to.group=Add to group
label.add.user=Add User
+label.add.userdata=Userdata
label.add.vlan=Add VLAN
label.add.vxlan=Add VXLAN
label.add.VM.to.tier=Add VM to tier
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/068e508e/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 7dd73bf..086bcd0 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -534,6 +534,16 @@
<a href="6"><fmt:message key="label.edit"/></a>
</div>
</div>
+
+ <!-- userdata -->
+ <div class="select">
+ <div class="select">
+ <span><fmt:message key="label.add.userdata"/> (<fmt:message key="label.optional"/>)</span>
+ </div>
+ <div class="value">
+ <textarea name="userdata" class="disallowSpecialCharacters"></textarea>
+ </div>
+ </div>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/068e508e/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index d9e7bef..e4d3e30 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -981,6 +981,13 @@
hostid : g_hostid
});
}
+
+ var userdata = args.data.userdata;
+ if (userdata != null && userdata.length > 0) {
+ $.extend(deployVmData, {
+ userdata : todb(btoa(userdata))
+ });
+ }
$(window).trigger('cloudStack.deployVirtualMachine', {
deployVmData: deployVmData,
[2/2] git commit: updated refs/heads/master to ca12133
Posted by bh...@apache.org.
Merge remote-tracking branch 'worldline/master'
This closes #55
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ca121336
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ca121336
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ca121336
Branch: refs/heads/master
Commit: ca121336a0d9820fe7c2521ad3f9aeb86ec36fbd
Parents: 1a99c39 068e508
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue Dec 9 17:36:27 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Dec 9 17:36:43 2014 +0530
----------------------------------------------------------------------
client/WEB-INF/classes/resources/messages.properties | 1 +
ui/index.jsp | 10 ++++++++++
ui/scripts/instanceWizard.js | 7 +++++++
3 files changed, 18 insertions(+)
----------------------------------------------------------------------