diff --git a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/030_require_cell_setup.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/030_require_cell_setup.py
index ffd975c387..fe3822e19c 100644
--- a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/030_require_cell_setup.py
+++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/030_require_cell_setup.py
@@ -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)
diff --git a/releasenotes/notes/ocata-requires-cellv2-96bd243be874d77f.yaml b/releasenotes/notes/ocata-requires-cellv2-96bd243be874d77f.yaml
index 7e1470034f..189e496a6f 100644
--- a/releasenotes/notes/ocata-requires-cellv2-96bd243be874d77f.yaml
+++ b/releasenotes/notes/ocata-requires-cellv2-96bd243be874d77f.yaml
@@ -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.