From 2f87c2212fa54773211bf7302ed8c1629325b213 Mon Sep 17 00:00:00 2001
From: frank <frank.zhang@citrix.com>
Date: Mon, 16 Apr 2012 16:30:11 -0700
Subject: [PATCH] merge cloud-setup-bridge-db to cloud-setup-databases

---
 awsapi-setup/setup/cloud-setup-bridge-db | 15 ---------------
 setup/bindir/cloud-setup-databases.in    |  7 +++++++
 2 files changed, 7 insertions(+), 15 deletions(-)
 delete mode 100644 awsapi-setup/setup/cloud-setup-bridge-db

diff --git a/awsapi-setup/setup/cloud-setup-bridge-db b/awsapi-setup/setup/cloud-setup-bridge-db
deleted file mode 100644
index 435ba5c5a1e..00000000000
--- a/awsapi-setup/setup/cloud-setup-bridge-db
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/python
-#
-# Cloud.com Bridge DB setup script.
-#
-
-from getpass import getpass 
-from subprocess import call
-
-setup_db_dir = '/usr/share/cloud/setup/bridge/db'
-setup_db_script = 'deploy-db-bridge.sh'
-
-print 'Welcome to CloudBridge Database setup.'
-passwd = getpass('Please enter the MySQL password for root@localhost: ')
-
-call(['/bin/bash', setup_db_script, 'cloud', 'root', passwd], cwd=setup_db_dir)
diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in
index 62c71359685..451d2831cc7 100755
--- a/setup/bindir/cloud-setup-databases.in
+++ b/setup/bindir/cloud-setup-databases.in
@@ -127,10 +127,17 @@ class DBDeployer(object):
             mysqlCmds = ['mysql', '--user=%s'%kwargs['user'], '--host=%s'%kwargs['host'], '--port=%s'%kwargs['port']]
             if kwargs.has_key('passwd'):
                 mysqlCmds.append('--password=%s'%kwargs['passwd'])
+                passwd = kwargs['passwd']
+            else:
+                passwd = ''
             file(self.tmpMysqlFile, 'w').write(text)
             mysqlCmds.append('<')
             mysqlCmds.append(self.tmpMysqlFile)
             runCmd(mysqlCmds)
+            
+            awsApiDbDir = '/usr/share/cloud/setup/bridge/db'
+            awsApiCmds = ['cd %s'%awsApiDbDir, 'sh deploy-db-bridge.sh %s'%passwd, 'cd -']
+            runCmd(awsApiCmds)
         except Exception, e:
             err = '''Encountering an error when executing mysql script
 ----------------------------------------------------------------------