summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-21 17:57:51 +0000
committerGerrit Code Review <review@openstack.org>2017-04-21 17:57:51 +0000
commit893ee87d3c40675383df286eac84a8093430c154 (patch)
tree20eee7389c7131f9e037ec5077412fa39bdec2b7 /doc
parent60ad3649638cd36b89a31aeacee4fdeb44d9be6a (diff)
parenta2fd38f45ac03c361ff7ccb213f5ea39b013ea9c (diff)
downloadnova-893ee87d3c40675383df286eac84a8093430c154.tar.gz
Merge "Tell people that the nova-cells man page is for cells v1"
Diffstat (limited to 'doc')
-rw-r--r--doc/source/man/nova-cells.rst7
-rw-r--r--doc/source/man/nova-manage.rst2
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/source/man/nova-cells.rst b/doc/source/man/nova-cells.rst
index 8ee5944d80..0b12d25cbb 100644
--- a/doc/source/man/nova-cells.rst
+++ b/doc/source/man/nova-cells.rst
@@ -23,7 +23,12 @@ DESCRIPTION
Starts the nova-cells service.
-The nova-cells service handles communication between cells and selects cells for new instances.
+The nova-cells service handles communication between cells and selects cells
+for new instances.
+
+.. warning:: Everything in this document is referring to Cells v1, which is
+ not recommended for new deployments. For information about commands to use
+ with Cells v2, see the man page for :ref:`man-page-cells-v2`.
OPTIONS
=======
diff --git a/doc/source/man/nova-manage.rst b/doc/source/man/nova-manage.rst
index afcdd6f4b0..2bc6c41a74 100644
--- a/doc/source/man/nova-manage.rst
+++ b/doc/source/man/nova-manage.rst
@@ -76,6 +76,8 @@ Nova API Database
Sync the api cells database up to the most recent version. This is the standard way to create the db as well.
+.. _man-page-cells-v2:
+
Nova Cells v2
~~~~~~~~~~~~~