Merge remote-tracking branch 'worldline/master'

This closes #55

Signed-off-by: Rohit Yadav <[email protected]>

Author: yadvr

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

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>

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,