diff options
author | Stephen Finucane <stephenfin@redhat.com> | 2021-06-16 14:05:37 +0100 |
---|---|---|
committer | Stephen Finucane <stephenfin@redhat.com> | 2021-08-09 15:34:40 +0100 |
commit | c3e113eb31283614e391b46ec596c479add6bbf5 (patch) | |
tree | 936bfd6bdbd93d88f488e964dc5b85c4bbb07ed4 /nova/cmd | |
parent | 38a022166fc1f9df4a02d3746da7092dd4a6186d (diff) | |
download | nova-c3e113eb31283614e391b46ec596c479add6bbf5.tar.gz |
db: Trivial style changes
Rewrap some code just to make it a little less fugly to read.
Change-Id: If78bbd578bbba73fc85446ad55d34d3addd6c4af
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Diffstat (limited to 'nova/cmd')
-rw-r--r-- | nova/cmd/manage.py | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py index 335ad29225..d0f1baaa24 100644 --- a/nova/cmd/manage.py +++ b/nova/cmd/manage.py @@ -181,23 +181,30 @@ class DbCommands(object): # NOTE(mdoff): Multiple cells not yet implemented. Currently # fanout only looks for cell0. try: - cell_mapping = objects.CellMapping.get_by_uuid(ctxt, - objects.CellMapping.CELL0_UUID) + cell_mapping = objects.CellMapping.get_by_uuid( + ctxt, objects.CellMapping.CELL0_UUID, + ) with context.target_cell(ctxt, cell_mapping) as cctxt: migration.db_sync(version, context=cctxt) except exception.CellMappingNotFound: - print(_('WARNING: cell0 mapping not found - not' - ' syncing cell0.')) + msg = _( + 'WARNING: cell0 mapping not found - not syncing cell0.' + ) + print(msg) except Exception as e: - print(_("""ERROR: Could not access cell0. -Has the nova_api database been created? -Has the nova_cell0 database been created? -Has "nova-manage api_db sync" been run? -Has "nova-manage cell_v2 map_cell0" been run? -Is [api_database]/connection set in nova.conf? -Is the cell0 database connection URL correct? -Error: %s""") % str(e)) + msg = _( + 'ERROR: Could not access cell0.\n' + 'Has the nova_api database been created?\n' + 'Has the nova_cell0 database been created?\n' + 'Has "nova-manage api_db sync" been run?\n' + 'Has "nova-manage cell_v2 map_cell0" been run?\n' + 'Is [api_database]/connection set in nova.conf?\n' + 'Is the cell0 database connection URL correct?\n' + 'Error: %s' + ) + print(msg % str(e)) return 1 + return migration.db_sync(version) def version(self): |