openstack
/
nova
Code Issues Proposed changes

Merge "Fix instructions for running simple_cell_setup"

This commit is contained in:
Jenkins 2016-12-12 21:27:34 +00:00 committed by Gerrit Code Review
parent ae63a7a5a8 6764ff0db2
commit 8f354f777f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/db/sqlalchemy/api_migrations/migrate_repo/versions/030_require_cell_setup.py
View File

@ -36,7 +36,7 @@ def upgrade(migrate_engine):
# Two mappings are required at a minimum, cell0 and your first cell
if count < 2:
msg = _('Cell mappings are not created, but required for Ocata. '
'Please run nova-manage db simple_cell_setup before '
'Please run nova-manage cell_v2 simple_cell_setup before '
'continuing.')
raise exception.ValidationError(detail=msg)
@ -44,14 +44,14 @@ def upgrade(migrate_engine):
cell_mappings.c.uuid == objects.CellMapping.CELL0_UUID).scalar()
if count != 1:
msg = _('A mapping for Cell0 was not found, but is required for '
'Ocata. Please run nova-manage db simple_cell_setup before '
'continuing.')
'Ocata. Please run nova-manage cell_v2 simple_cell_setup '
'before continuing.')
raise exception.ValidationError(detail=msg)
host_mappings = Table('host_mappings', meta, autoload=True)
count = select([func.count()]).select_from(host_mappings).scalar()
if count == 0:
msg = _('No host mappings were found, but are required for Ocata. '
'Please run nova-manage db simple_cell_setup before '
'Please run nova-manage cell_v2 simple_cell_setup before '
'continuing.')
raise exception.ValidationError(detail=msg)

2
releasenotes/notes/ocata-requires-cellv2-96bd243be874d77f.yaml
View File

@ -3,5 +3,5 @@ upgrade:
- Ocata requires that your deployment have created the
cell and host mappings in Newton. If you have not done
this, Ocata's `db sync` command will fail. Small deployments
will want to run `nova-manage db simple_cell_setup`
will want to run `nova-manage cell_v2 simple_cell_setup`
on Newton before upgrading.