diff --git a/contrail_provisioning/storage/setup.py b/contrail_provisioning/storage/setup.py
index a93feb0d..799fe9a8 100644
--- a/contrail_provisioning/storage/setup.py
+++ b/contrail_provisioning/storage/setup.py
@@ -23,6 +23,7 @@ def __init__(self, args_str = None):
 
         self.global_defaults = {
             'storage_master': '127.0.0.1',
+            'service_dbpass': 'c0ntrail123',
         }
         self.parse_args(args_str)
 
@@ -141,7 +142,7 @@ def enable_storage(self):
         storage_setup_args = storage_setup_args + " --storage-replica-size %s" %(self._args.storage_replica_size)
         storage_setup_args = storage_setup_args + " --openstack-ip %s" %(self._args.openstack_ip)
         storage_setup_args = storage_setup_args + " --orig-hostnames %s" %(' '.join(self._args.orig_hostnames))
-        storage_setup_args = storage_setup_args + " --service-dbpass %s" %(' '.join(self._args.service_dbpass))
+        storage_setup_args = storage_setup_args + " --service-dbpass %s" % self._args.service_dbpass
 
         #Setup storage if storage is defined in testbed.py
         with settings(host_string=self._args.storage_master, password=storage_master_passwd):