From 95551006f33d82a339e1f772fa3aae04bdf73061 Mon Sep 17 00:00:00 2001
From: qiaomin <chen.qiaomin@99cloud.net>
Date: Sat, 26 Nov 2016 14:59:22 +0000
Subject: [PATCH] [ops-guide] Use 'openstack server list' to replace 'nova
 list'

This patch use 'openstack server list' to replace 'nova list' in
ops-guide for cleanup.

Change-Id: I98298d45e43aa3cd7212a0cf1c7a872f71d37d46
Implements: blueprint use-openstack-command
---
 doc/ops-guide/source/ops-logging.rst                | 10 +++++-----
 doc/ops-guide/source/ops-maintenance-compute.rst    |  4 ++--
 doc/ops-guide/source/ops-maintenance-controller.rst |  2 +-
 doc/ops-guide/source/ops-maintenance-determine.rst  |  8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/doc/ops-guide/source/ops-logging.rst b/doc/ops-guide/source/ops-logging.rst
index dae91295f9..d95f4a70f7 100644
--- a/doc/ops-guide/source/ops-logging.rst
+++ b/doc/ops-guide/source/ops-logging.rst
@@ -146,11 +146,11 @@ Consider the following example:
 .. code-block:: console
 
    $ openstack server list
-   +--------------------------------+--------+--------+--------------------------+
-   | ID                             | Name   | Status | Networks                 |
-   +--------------------------------+--------+--------+--------------------------+
-   | fafed8-4a46-413b-b113-f1959ffe | cirros | ACTIVE | novanetwork=192.168.100.3|
-   +--------------------------------+--------+--------+--------------------------+
+   +--------------------------------+--------+--------+--------------------------+------------+
+   | ID                             | Name   | Status | Networks                 | Image Name |
+   +--------------------------------+--------+--------+--------------------------+------------+
+   | fafed8-4a46-413b-b113-f1959ffe | cirros | ACTIVE | novanetwork=192.168.100.3| cirros     |
+   +--------------------------------------+--------+--------+--------------------+------------+
 
 Here, the ID associated with the instance is
 ``faf7ded8-4a46-413b-b113-f19590746ffe``. If you search for this string
diff --git a/doc/ops-guide/source/ops-maintenance-compute.rst b/doc/ops-guide/source/ops-maintenance-compute.rst
index 72b0754bca..0225742df7 100644
--- a/doc/ops-guide/source/ops-maintenance-compute.rst
+++ b/doc/ops-guide/source/ops-maintenance-compute.rst
@@ -26,7 +26,7 @@ a software or hardware upgrade, perform the following steps:
 
         .. code-block:: console
 
-           # nova list --host c01.example.com --all-tenants
+           # openstack server list --host c01.example.com --all-projects
 
      #. Migrate all instances one by one:
 
@@ -112,7 +112,7 @@ by performing the following command:
 
 .. code-block:: console
 
-   # nova list --host c01.example.com --all-tenants
+   # openstack server list --host c01.example.com --all-projects
 
 After you have the list, you can use the :command:`nova` command to start each
 instance:
diff --git a/doc/ops-guide/source/ops-maintenance-controller.rst b/doc/ops-guide/source/ops-maintenance-controller.rst
index 5cac1385e4..e4fddc97f7 100644
--- a/doc/ops-guide/source/ops-maintenance-controller.rst
+++ b/doc/ops-guide/source/ops-maintenance-controller.rst
@@ -51,7 +51,7 @@ confident that those services are in working condition:
 
    # source openrc
    # glance index
-   # nova list
+   # openstack server list
    # openstack project list
 
 For the storage proxy, ensure that the :term:`Object Storage service <Object
diff --git a/doc/ops-guide/source/ops-maintenance-determine.rst b/doc/ops-guide/source/ops-maintenance-determine.rst
index 0cf753b079..331ecd5efd 100644
--- a/doc/ops-guide/source/ops-maintenance-determine.rst
+++ b/doc/ops-guide/source/ops-maintenance-determine.rst
@@ -13,8 +13,8 @@ Tailing Logs
 ~~~~~~~~~~~~
 
 The first place to look is the log file related to the command you are
-trying to run. For example, if ``nova list`` is failing, try tailing a
-nova log file and running the command again:
+trying to run. For example, if ``openstack server list`` is failing, try
+tailing a nova log file and running the command again:
 
 Terminal 1:
 
@@ -26,7 +26,7 @@ Terminal 2:
 
 .. code-block:: console
 
-   # nova list
+   # openstack server list
 
 Look for any errors or traces in the log file. For more information, see
 :doc:`ops-logging-monitoring`.
@@ -45,7 +45,7 @@ Terminal 2:
 
 .. code-block:: console
 
-   # nova list
+   # openstack server list
 
 Wash, rinse, and repeat until you find the core cause of the problem.