Merge "Fix indentation to avoid unnecessary quotes"

This commit is contained in:
Jenkins 2017-02-23 23:32:05 +00:00 committed by Gerrit Code Review
commit 667b522227
4 changed files with 69 additions and 69 deletions
doc
admin-guide/source
config-reference/source/block-storage/drivers
ha-guide/source
user-guide/source

@ -128,11 +128,11 @@ consistency group snapshot:
The details of consistency group operations are shown in the following.
.. note::
.. note::
Currently, no OpenStack client command is available to run in
place of the cinder consistency group creation commands. Use the
cinder commands detailed in the following examples.
Currently, no OpenStack client command is available to run in
place of the cinder consistency group creation commands. Use the
cinder commands detailed in the following examples.
**Create a consistency group**:

@ -180,35 +180,35 @@ Setup VMAX drivers
# yum install pywbem
.. note::
.. note::
A potential issue can exist with the ``python-pywbem`` dependency package,
especially M2crypto. To troubleshot and resolve these types of issues,
follow these steps.
A potential issue can exist with the ``python-pywbem`` dependency package,
especially M2crypto. To troubleshot and resolve these types of issues,
follow these steps.
- On Ubuntu:
- On Ubuntu:
.. code-block:: console
.. code-block:: console
# apt-get remove --purge -y python-m2crypto
# pip uninstall pywbem
# apt-get install python-pywbem
# apt-get remove --purge -y python-m2crypto
# pip uninstall pywbem
# apt-get install python-pywbem
- On openSUSE:
- On openSUSE:
.. code-block:: console
.. code-block:: console
# zypper remove --clean-deps python-m2crypto
# pip uninstall pywbem
# zypper install python-pywbem
# zypper remove --clean-deps python-m2crypto
# pip uninstall pywbem
# zypper install python-pywbem
- On Red Hat Enterprise Linux, CentOS, and Fedora:
- On Red Hat Enterprise Linux, CentOS, and Fedora:
.. code-block:: console
.. code-block:: console
# yum remove python-m2crypto
# sudo pip uninstall pywbem
# yum install pywbem
# yum remove python-m2crypto
# sudo pip uninstall pywbem
# yum install pywbem
#. Install iSCSI Utilities (for iSCSI drivers only).

@ -529,27 +529,27 @@ start it:
#. Start ``pacemaker`` with the LSB init script:
.. code-block:: console
.. code-block:: console
# /etc/init.d/pacemaker start
# /etc/init.d/pacemaker start
Alternatively:
Alternatively:
.. code-block:: console
.. code-block:: console
# service pacemaker start
# service pacemaker start
#. Start ``pacemaker`` with upstart:
.. code-block:: console
.. code-block:: console
# start pacemaker
# start pacemaker
#. Start ``pacemaker`` with the systemd unit file:
.. code-block:: console
.. code-block:: console
# systemctl start pacemaker
# systemctl start pacemaker
After the ``pacemaker`` service has started, Pacemaker creates a default empty
cluster configuration with no resources. Use the :command:`crm_mon` utility to

@ -11,44 +11,44 @@ OpenStack supports booting instances using ISO images. But before you
make such instances functional, use the :command:`openstack server create`
command with the following parameters to boot an instance:
.. code-block:: console
.. code-block:: console
$ openstack server create --image ubuntu-14.04.2-server-amd64.iso \
--nic net-id = NETWORK_UUID \
--flavor 2 INSTANCE_NAME
+--------------------------------------+--------------------------------------------+
| Field | Value |
+--------------------------------------+--------------------------------------------+
| OS-DCF:diskConfig | MANUAL |
| OS-EXT-AZ:availability_zone | nova |
| OS-EXT-SRV-ATTR:host | - |
| OS-EXT-SRV-ATTR:hypervisor_hostname | - |
| OS-EXT-SRV-ATTR:instance_name | instance-00000004 |
| OS-EXT-STS:power_state | 0 |
| OS-EXT-STS:task_state | scheduling |
| OS-EXT-STS:vm_state | building |
| OS-SRV-USG:launched_at | - |
| OS-SRV-USG:terminated_at | - |
| accessIPv4 | |
| accessIPv6 | |
| adminPass | ZaiYeC8iucgU |
| config_drive | |
| created | 2015-06-01T16:34:50Z |
| flavor | m1.small (2) |
| hostId | |
| id | 1e1797f3-1662-49ff-ae8c-a77e82ee1571 |
| image | ubuntu-14.04.2-server-amd64.iso |
| key_name | - |
| metadata | {} |
| name | INSTANCE_NAME |
| os-extended-volumes:volumes_attached | [] |
| progress | 0 |
| security_groups | default |
| status | BUILD |
| tenant_id | ccef9e62b1e645df98728fb2b3076f27 |
| updated | 2014-05-09T16:34:51Z |
| user_id | fef060ae7bfd4024b3edb97dff59017a |
+--------------------------------------+--------------------------------------------+
$ openstack server create --image ubuntu-14.04.2-server-amd64.iso \
--nic net-id = NETWORK_UUID \
--flavor 2 INSTANCE_NAME
+--------------------------------------+--------------------------------------------+
| Field | Value |
+--------------------------------------+--------------------------------------------+
| OS-DCF:diskConfig | MANUAL |
| OS-EXT-AZ:availability_zone | nova |
| OS-EXT-SRV-ATTR:host | - |
| OS-EXT-SRV-ATTR:hypervisor_hostname | - |
| OS-EXT-SRV-ATTR:instance_name | instance-00000004 |
| OS-EXT-STS:power_state | 0 |
| OS-EXT-STS:task_state | scheduling |
| OS-EXT-STS:vm_state | building |
| OS-SRV-USG:launched_at | - |
| OS-SRV-USG:terminated_at | - |
| accessIPv4 | |
| accessIPv6 | |
| adminPass | ZaiYeC8iucgU |
| config_drive | |
| created | 2015-06-01T16:34:50Z |
| flavor | m1.small (2) |
| hostId | |
| id | 1e1797f3-1662-49ff-ae8c-a77e82ee1571 |
| image | ubuntu-14.04.2-server-amd64.iso |
| key_name | - |
| metadata | {} |
| name | INSTANCE_NAME |
| os-extended-volumes:volumes_attached | [] |
| progress | 0 |
| security_groups | default |
| status | BUILD |
| tenant_id | ccef9e62b1e645df98728fb2b3076f27 |
| updated | 2014-05-09T16:34:51Z |
| user_id | fef060ae7bfd4024b3edb97dff59017a |
+--------------------------------------+--------------------------------------------+
In this command, ``ubuntu-14.04.2-server-amd64.iso`` is the ISO image,
and ``INSTANCE_NAME`` is the name of the new instance. ``NETWORK_UUID``