apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

add templates.vmware.sql

Browse Source 
modify build to deploy vmware database records
This commit is contained in:
Kelven Yang 2010-08-24 22:58:05 -07:00
parent 49900a8985
commit 45cb68e7e2
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/developer.xml
View File

@ -169,11 +169,18 @@
<available file="${setup.db.dir}/override/templates.xenserver.sql" />
</condition>
<condition property="vmware.templates.file" value="override/templates.vmware.sql" else="templates.vmware.sql">
<available file="${setup.db.dir}/override/templates.vmware.sql" />
</condition>
<condition property="templates.file" value="${kvm.templates.file}" else="${xenserver.templates.file}" >
<condition property="templates.file.intermediate" value="${kvm.templates.file}" else="${xenserver.templates.file}" >
<isset property="KVM"/>
</condition>
<condition property="templates.file" value="${vmware.templates.file}" else="${templates.file.intermediate}" >
<isset property="vmware"/>
</condition>
<echo message="deploydb ${server-setup.file} ${templates.file} ${DBROOTPW}" />
<exec dir="${setup.db.dir}" executable="bash">
<arg value="deploy-db-dev.sh" />

1
server/src/com/cloud/servlet/ConsoleProxyServlet.java
View File

@ -282,6 +282,7 @@ public class ConsoleProxyServlet extends HttpServlet {
private void sendResponse(HttpServletResponse resp, String content) {
try {
resp.setContentType("text/html");
resp.getWriter().print(content);
} catch(IOException e) {
if(s_logger.isInfoEnabled())

2
setup/db/templates.xenserver.sql
View File

@ -72,6 +72,4 @@ INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (58,
INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (59, 7, 'Other install media', 'Ubuntu');
INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (60, 7, 'Other install media', 'Other');
-- temporarily added for vmware, will be moved when vmware support is fully in-place
INSERT INTO `cloud`.`host_master`(`type`, `service_address`, `admin`, `password`) VALUES('VSphere', 'vsphere-1.lab.vmops.com', 'Administrator', 'Suite219');