From fb168ffb47e5b93df491a80248523d35757b51ca Mon Sep 17 00:00:00 2001 From: Lin Yang Date: Mon, 24 Aug 2015 11:51:55 +0800 Subject: [PATCH] Remove hardcoded config file in error message Previously, it throw error message when database connection was not defined, "ValueError: Database connection not set in /etc/magnum/magnum.conf" even if it was explicitly run with "--config-file /other/location". So remove that hardcoded config file location. Change-Id: I3af00f1f6572c3cd9e56141e1774acf373bbce8b Closes-Bug: #1487258 --- magnum/cmd/db_manage.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/magnum/cmd/db_manage.py b/magnum/cmd/db_manage.py index 1d7471dc12..dda82dd734 100644 --- a/magnum/cmd/db_manage.py +++ b/magnum/cmd/db_manage.py @@ -20,6 +20,8 @@ from oslo_db import options from oslo_db.sqlalchemy.migration_cli import manager from oslo_log import log as logging +from magnum.i18n import _ + LOG = logging.getLogger(__name__) CONF = cfg.CONF @@ -63,7 +65,7 @@ def add_command_parsers(subparsers): def get_manager(): if cfg.CONF.database.connection is None: raise ValueError( - 'Database connection not set in /etc/magnum/magnum.conf') + _('Could not find parameter database.connection in config file')) alembic_path = os.path.abspath( os.path.join(os.path.dirname(__file__),