openstack/openstack-manuals
Code Issues Proposed changes

Merge "Remove unnecessary indent to avoid blockquote"

Browse Source
This commit is contained in:
Jenkins 2015-10-09 05:51:59 +00:00 committed by Gerrit Code Review
commit a2ad143ffe
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/user-guide/source/cli_manage_bare_metal_nodes.rst
View File

@ -119,16 +119,16 @@ network control via Neutron and OpenFlow.
.. note::
Set the ``--availability_zone`` parameter to specify which zone or
node to use to start the server. Separate the zone from the host
name with a comma. For example:
Set the ``--availability_zone`` parameter to specify which zone or
node to use to start the server. Separate the zone from the host
name with a comma. For example:
.. code::
.. code-block:: console
$ nova boot --availability_zone zone:HOST,NODE
``host`` is optional for the ``--availability_zone`` parameter. You
can simply specify ``zone:,node``, still including the comma.
``host`` is optional for the ``--availability_zone`` parameter. You
can simply specify ``zone:,node``, still including the comma.
List bare-metal nodes and interfaces
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

40
doc/user-guide/source/cli_nova_launch_instance_from_volume.rst
View File

@ -177,34 +177,34 @@ the volume to boot an instance.
The parameters are:
- ``--flavor`` FLAVOR. The flavor ID or name.
- ``--flavor`` FLAVOR. The flavor ID or name.
- ``--block-device``
source=SOURCE,id=ID,dest=DEST,size=SIZE,shutdown=PRESERVE,bootindex=INDEX
- ``--block-device``
source=SOURCE,id=ID,dest=DEST,size=SIZE,shutdown=PRESERVE,bootindex=INDEX
**source=SOURCE**
The type of object used to create the block device. Valid values
are ``volume``, ``snapshot``, ``image``, and ``blank``.
**source=SOURCE**
The type of object used to create the block device. Valid values
are ``volume``, ``snapshot``, ``image``, and ``blank``.
**id=ID**
The ID of the source object.
**id=ID**
The ID of the source object.
**dest=DEST**
The type of the target virtual device. Valid values are ``volume``
and ``local``.
**dest=DEST**
The type of the target virtual device. Valid values are ``volume``
and ``local``.
**size=SIZE**
The size of the volume that is created.
**size=SIZE**
The size of the volume that is created.
**shutdown={preserve\|remove}**
What to do with the volume when the instance is deleted.
``preserve`` does not delete the volume. ``remove`` deletes the
volume.
**shutdown={preserve\|remove}**
What to do with the volume when the instance is deleted.
``preserve`` does not delete the volume. ``remove`` deletes the
volume.
**bootindex=INDEX**
Orders the boot disks. Use ``0`` to boot from this volume.
**bootindex=INDEX**
Orders the boot disks. Use ``0`` to boot from this volume.
- ``NAME``. The name for the server.
- ``NAME``. The name for the server.
#. Create a bootable volume from an image, before the instance boots. The
volume is not deleted when the instance is terminated::