From 058326648ec6d1fd74bd40d062d63e68428f0e1f Mon Sep 17 00:00:00 2001
From: chenxing <chen.xing@99cloud.net>
Date: Fri, 2 Dec 2016 05:55:21 +0000
Subject: [PATCH] [admin-guide] Replace "nova boot" with "openstack server
 create"

Change-Id: I9d7d44e98487a230103b532ee55283a49d93229f
Implements: blueprint use-openstack-command
---
 doc/admin-guide/source/compute-networking-nova.rst | 10 ++++++----
 doc/admin-guide/source/compute-security.rst        |  3 ++-
 doc/admin-guide/source/telemetry-measurements.rst  |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/doc/admin-guide/source/compute-networking-nova.rst b/doc/admin-guide/source/compute-networking-nova.rst
index 02d80f0839..785024688c 100644
--- a/doc/admin-guide/source/compute-networking-nova.rst
+++ b/doc/admin-guide/source/compute-networking-nova.rst
@@ -391,7 +391,7 @@ retrieve the metadata, make a GET request to
 
 Instances also retrieve user data (passed as the ``user_data`` parameter
 in the API call or by the :option:`--user_data` flag in the
-:command:`nova boot` command) through the metadata service, by making a
+:command:`openstack server create` command) through the metadata service, by making a
 GET request to ``http://169.254.169.254/openstack/2012-08-10/user_data``:
 
 .. code-block:: console
@@ -739,7 +739,8 @@ Save the file, and restart ``nova-network``
 .. note::
 
    If this option is enabled, but all floating IP addresses have
-   already been allocated, the :command:`nova boot` command will fail.
+   already been allocated, the :command:`openstack server create`
+   command will fail.
 
 Remove a network from a project
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -834,11 +835,12 @@ Edit the ``/etc/network/interfaces`` file:
 
 If the Virtual Network Service Neutron is installed, you can specify the
 networks to attach to the interfaces by using the :option:`--nic` flag with
-the :command:`nova boot` command:
+the :command:`openstack server create` command:
 
 .. code-block:: console
 
-   $ nova boot --image ed8b2a37-5535-4a5f-a615-443513036d71 --flavor 1 --nic net-id=NETWORK1_ID --nic net-id=NETWORK2_ID test-vm1
+   $ openstack server create --image ed8b2a37-5535-4a5f-a615-443513036d71 \
+     --flavor 1 --nic net-id=NETWORK1_ID --nic net-id=NETWORK2_ID test-vm1
 
 Troubleshooting Networking
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/admin-guide/source/compute-security.rst b/doc/admin-guide/source/compute-security.rst
index 50a422f415..1b4f12adef 100644
--- a/doc/admin-guide/source/compute-security.rst
+++ b/doc/admin-guide/source/compute-security.rst
@@ -134,7 +134,8 @@ settings:
 
    .. code-block:: console
 
-      $ nova boot --flavor m1.tiny --key-name myKeypairName --image myImageID newInstanceName
+      $ openstack server create --flavor m1.tiny \
+        --key-name myKeypairName --image myImageID newInstanceName
 
 
 .. figure:: figures/OpenStackTrustedComputePool2.png
diff --git a/doc/admin-guide/source/telemetry-measurements.rst b/doc/admin-guide/source/telemetry-measurements.rst
index d82c931333..c80db9d3d6 100644
--- a/doc/admin-guide/source/telemetry-measurements.rst
+++ b/doc/admin-guide/source/telemetry-measurements.rst
@@ -53,7 +53,7 @@ modified boot command look like the following:
 
 .. code-block:: console
 
-   $ nova boot --meta metering.custom_metadata=a_value my_vm
+   $ openstack server create --property metering.custom_metadata=a_value my_vm
 
 The other option is to set the ``reserved_metadata_keys`` to the list of
 metadata keys that you would like to be included in