From 3cba1c06da0e9b3270781f9e0204b3fe3b2d8c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 12 Jun 2013 22:42:37 +0200 Subject: [PATCH] wcsinstd: fix passing of the database name to wcsctl --- wcsinst/wcsinstd/deploy.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wcsinst/wcsinstd/deploy.py b/wcsinst/wcsinstd/deploy.py index ba13c68..fcf74c6 100644 --- a/wcsinst/wcsinstd/deploy.py +++ b/wcsinst/wcsinstd/deploy.py @@ -118,9 +118,12 @@ class DeployInstance(object): def make_sql_tables(self, wcs_cfg): params = [] - for param in ('dbname', 'user', 'password', 'host', 'port'): + for param in ('database', 'user', 'password', 'host', 'port'): if wcs_cfg.get('postgresql').get(param): - params.append('--' + param) + if param == 'database': + params.append('--dbname') + else: + params.append('--' + param) params.append(wcs_cfg.get('postgresql').get(param)) os.system('%s convert-to-sql %s %s' % (app_settings.WCSCTL_SCRIPT, ' '.join(params), self.domain))