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 2013/01/19 03:18:38 UTC

[1/6] git commit: db.properties: adding other key value info for dbcreator to work in a generic way

db.properties: adding other key value info for dbcreator to work in a generic way

Signed-off-by: Rohit Yadav <bh...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6214b1d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6214b1d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6214b1d4

Branch: refs/heads/javelin
Commit: 6214b1d4bd9347a2799e5fd461b776dd5e32f19d
Parents: 593b60c
Author: Rohit Yadav <bh...@apache.org>
Authored: Fri Jan 18 17:18:28 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Fri Jan 18 17:19:55 2013 -0800

----------------------------------------------------------------------
 client/tomcatconf/db.properties.in |    4 ++++
 utils/conf/db.properties           |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6214b1d4/client/tomcatconf/db.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/db.properties.in b/client/tomcatconf/db.properties.in
index e383667..b730f7c 100644
--- a/client/tomcatconf/db.properties.in
+++ b/client/tomcatconf/db.properties.in
@@ -65,6 +65,10 @@ db.usage.maxWait=10000
 db.usage.autoReconnect=true
 
 # awsapi database settings
+db.awsapi.username=@DBUSER@
+db.awsapi.password=@DBPW@
+db.awsapi.host=@DBHOST@
+db.awsapi.port=3306
 db.awsapi.name=cloudbridge
 
 # Simulator database settings

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6214b1d4/utils/conf/db.properties
----------------------------------------------------------------------
diff --git a/utils/conf/db.properties b/utils/conf/db.properties
index 18bf54c..1dcfcdd 100644
--- a/utils/conf/db.properties
+++ b/utils/conf/db.properties
@@ -56,6 +56,10 @@ db.usage.maxWait=10000
 db.usage.autoReconnect=true
 
 # awsapi database settings
+db.awsapi.username=cloud
+db.awsapi.password=cloud
+db.awsapi.host=localhost
+db.awsapi.port=3306
 db.awsapi.name=cloudbridge
 
 # Simulator database settings