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

Merge branch 'master' into vpc

Browse Source
This commit is contained in:
Alena Prokharchyk 2012-07-17 17:12:17 -07:00
commit 14fa5279e2
10 changed files with 87 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/developer.xml
View File

@ -167,7 +167,12 @@
<target name="deploy-server" depends="deploy-common, deploy-ovm, deploy-awsapi" >
<copy todir="${server.deploy.to.dir}/webapps/client/WEB-INF/lib/vms" file="${dist.dir}/systemvm.iso" />
</target>
<target name="deploy-server-encrypt" depends="deploy-server" >
<move file="${server.deploy.to.dir}/conf/db-enc.properties" tofile="${server.deploy.to.dir}/conf/db.properties" overwrite="true"/>
<echo file="/etc/cloud/management/key" append="false">password</echo>
</target>
<target name="deploy-common" >
<condition property="zip.uptodate">
<available file="${deploy.work.dir}/client.zip" type="file"/>

2
client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in
View File

@ -55,7 +55,7 @@ TOMCAT6_USER=tomcat6
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in $DEFAULT)
JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
JDK_DIRS="/usr/lib/jvm/java-1.6.0-openjdk-i386/ /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
# Look for the right JVM to use
for jdir in $JDK_DIRS; do

54
client/tomcatconf/db-enc.properties.in Normal file
View File

@ -0,0 +1,54 @@
# management server clustering parameters, change cluster.node.IP to the machine IP address
# in which the management server(Tomcat) is running
cluster.node.IP=127.0.0.1
cluster.servlet.port=9090
# CloudStack database settings
db.cloud.username=@DBUSER@
db.cloud.password=@DBPW@
db.cloud.host=@DBHOST@
db.cloud.port=3306
db.cloud.name=cloud
# CloudStack database tuning parameters
db.cloud.maxActive=250
db.cloud.maxIdle=30
db.cloud.maxWait=10000
db.cloud.autoReconnect=true
db.cloud.validationQuery=SELECT 1
db.cloud.testOnBorrow=true
db.cloud.testWhileIdle=true
db.cloud.timeBetweenEvictionRunsMillis=40000
db.cloud.minEvictableIdleTimeMillis=240000
db.cloud.removeAbandoned=false
db.cloud.removeAbandonedTimeout=300
db.cloud.logAbandoned=true
db.cloud.poolPreparedStatements=false
db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true
# CloudStack database SSL settings
db.cloud.useSSL=false
db.cloud.keyStore=
db.cloud.keyStorePassword=
db.cloud.trustStore=
db.cloud.trustStorePassword=
# Encryption Settings
db.cloud.encryption.type=file
db.cloud.encrypt.secret=password
# usage database settings
db.usage.username=@DBUSER@
db.usage.password=@DBPW@
db.usage.host=@DBHOST@
db.usage.port=3306
db.usage.name=cloud_usage
# usage database tuning parameters
db.usage.maxActive=100
db.usage.maxIdle=30
db.usage.maxWait=10000
db.usage.autoReconnect=true
# awsapi database settings
db.awsapi.name=cloudbridge

2
debian/cloud-daemonize.install vendored
View File

@ -1,2 +0,0 @@
/usr/bin/cloud-daemonize

2
debian/cloud-deps.install vendored
View File

@ -17,7 +17,7 @@
/usr/share/java/cloud-jstl-1.2.jar
/usr/share/java/cloud-axis.jar
/usr/share/java/cloud-commons-discovery.jar
/usr/share/java/cloud-wsdl4j.jar
/usr/share/java/cloud-wsdl4j-1.6.2.jar
/usr/share/java/cloud-bcprov-jdk16-1.45.jar
/usr/share/java/cloud-jsch-0.1.42.jar
/usr/share/java/cloud-iControl.jar

16
debian/cloud-server.install vendored
View File

@ -1,3 +1,19 @@
/usr/share/java/cloud-server.jar
/usr/share/java/cloud-ovm.jar
/etc/cloud/server/*
/usr/share/java/cloud-dp-user-concentrated-pod.jar
/usr/share/java/cloud-dp-user-dispersing.jar
/usr/share/java/cloud-host-allocator-random.jar
/usr/share/java/cloud-plugin-elb.jar
/usr/share/java/cloud-plugin-f5.jar
/usr/share/java/cloud-plugin-netapp.jar
/usr/share/java/cloud-plugin-netscaler.jar
/usr/share/java/cloud-plugin-ovs.jar
/usr/share/java/cloud-plugin-srx.jar
/usr/share/java/cloud-plugin-nicira-nvp.jar
/usr/share/java/cloud-storage-allocator-random.jar
/usr/share/java/cloud-user-authenticator-ldap.jar
/usr/share/java/cloud-user-authenticator-md5.jar
/usr/share/java/cloud-user-authenticator-plaintext.jar
/usr/share/java/cloud-xen.jar
/usr/share/java/cloud-vmware.jar

6
debian/cloud-test.install vendored
View File

@ -1,6 +0,0 @@
/usr/bin/cloud-run-test
/usr/share/java/cloud-test.jar
/var/lib/cloud/test/*
/usr/lib/cloud/test/*
/etc/cloud/test/*

19
debian/control vendored
View File

@ -73,15 +73,6 @@ Description: CloudStack agent scripts
will participate in your cloud -- this is a requirement for the CloudStack
agent.
Package: cloud-daemonize
Provides: vmops-daemonize
Conflicts: vmops-daemonize
Replaces: vmops-daemonize
Architecture: any
Description: CloudStack daemonization utility
This package contains a program that daemonizes the specified
process. The CloudStack Cloud Stack uses this to start the agent
as a service.
Package: cloud-core
Provides: vmops-core
@ -93,16 +84,6 @@ Description: CloudStack core library
The CloudStack core libraries provide a set of Java classes used
in the CloudStack Cloud Stack.
Package: cloud-test
Provides: vmops-test
Conflicts: vmops-test
Replaces: vmops-test
Architecture: any
Depends: openjdk-6-jre, wget, cloud-utils (= ${source:Version}), cloud-deps (= ${source:Version})
Description: CloudStack test suite
The CloudStack test package contains a suite of automated tests
that the very much appreciated QA team at CloudStack constantly
uses to help increase the quality of the Cloud Stack.
Package: cloud-client
Provides: vmops-client

8
ui/scripts/ui/widgets/listView.js
View File

@ -974,8 +974,8 @@
if (!options) options = {};
var context = options.context;
var reorder = options.reorder;
var $tbody = $table.find('tbody');
if (!loadArgs) loadArgs = {
page: 1,
filterBy: {
@ -1262,6 +1262,7 @@
});
var search = function() {
page = 1;
loadBody(
$table,
listViewData.dataProvider,
@ -1269,7 +1270,7 @@
listViewData.fields,
false,
{
page: 1,
page: page,
filterBy: {
kind: $listView.find('select[id=filterBy]').val(),
search: {
@ -1316,7 +1317,8 @@
var context = $listView.data('view-args').context;
if (loadMoreData) {
page = page + 1;
page = page + 1;
loadBody($table, listViewData.dataProvider, listViewData.preFilter, listViewData.fields, true, {
context: context,
page: page,

7
wscript_configure
View File

@ -56,9 +56,10 @@ systemjars = {
(
"servlet-api-2.5.jar",
"jsp-api-2.1.jar",
"jasper-6.0.28.jar",
"jasper.jar",
"el-api-2.1.jar",
"jasper-el-6.0.28.jar",
"jasper-el.jar",
"ecj.jar",
"cglib.jar",
"asm3.jar",
"jetty.jar",
@ -288,7 +289,7 @@ depsclasspath = [ in_javadir(_basename(x)) for x in _glob(_join(conf.srcdir,"dep
conf.env.DEPSCLASSPATH = pathsep.join(depsclasspath)
# the MS classpath points to JARs required to run the management server
msclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api core server server-extras core-extras vmware-base ovm dp-user-concentrated-pod dp-user-dispersing host-allocator-random plugin-f5 plugin-netscaler plugin-ovs plugin-srx storage-allocator-random user-authenticator-ldap user-authenticator-md5 user-authenticator-plaintext vmware xen plugin-nicira-nvp".split() ]
msclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api core server server-extras core-extras vmware-base ovm dp-user-concentrated-pod dp-user-dispersing host-allocator-random plugin-f5 plugin-netscaler plugin-ovs plugin-srx storage-allocator-random user-authenticator-ldap user-authenticator-md5 user-authenticator-plaintext vmware xen plugin-nicira-nvp plugin-elb plugin-netapp".split() ]
conf.env.MSCLASSPATH = pathsep.join(msclasspath)
# the agent and simulator classpaths point to JARs required to run these two applications