From ff2f4c669cffe2e5ec936ebbf385cacd514bb360 Mon Sep 17 00:00:00 2001 From: "Jay S. Bryant" Date: Fri, 7 Jul 2017 13:48:35 -0500 Subject: [PATCH] Fix errors preventing doc builds There were some syntax problems that came over with the migration of the install docs in commit: 88be92ee719baff6d5f2f7e7e073b118db2dc2e0 It appears that the docs build for Cinder is more strict than what was being done in openstack-manuals as the syntax issues were causing our build to fail. The next step in our doc migration is to fix these errors so we can do doc builds. Change-Id: I7282b2fa2efb50cbb6490ff36f69b123959b6dde --- doc/source/install/cinder-controller-install-obs.rst | 2 +- doc/source/install/cinder-storage-install-obs.rst | 2 +- doc/source/install/cinder-storage-install-rdo.rst | 2 +- doc/source/install/cinder-storage-install-ubuntu.rst | 2 +- doc/source/install/index.rst | 3 ++- driver-requirements.txt | 3 ++- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/source/install/cinder-controller-install-obs.rst b/doc/source/install/cinder-controller-install-obs.rst index 9df1615aee0..f1b92ee7a95 100644 --- a/doc/source/install/cinder-controller-install-obs.rst +++ b/doc/source/install/cinder-controller-install-obs.rst @@ -263,7 +263,7 @@ Install and configure components transport_url = rabbit://openstack:RABBIT_PASS@controller Replace ``RABBIT_PASS`` with the password you chose for the - ``openstack`` account in ``RabbitMQ``. + ``openstack`` account in ``RabbitMQ``. #. In the ``[DEFAULT]`` and ``[keystone_authtoken]`` sections, configure Identity service access: diff --git a/doc/source/install/cinder-storage-install-obs.rst b/doc/source/install/cinder-storage-install-obs.rst index 0bc9dbf83be..350e1354b31 100644 --- a/doc/source/install/cinder-storage-install-obs.rst +++ b/doc/source/install/cinder-storage-install-obs.rst @@ -63,7 +63,7 @@ storage node, you must prepare the storage device. ``/dev/sdb`` device and rejects all other devices: .. path /etc/lvm/lvm.conf - .. code-block:: none + .. code-block:: bash devices { ... diff --git a/doc/source/install/cinder-storage-install-rdo.rst b/doc/source/install/cinder-storage-install-rdo.rst index 0413d9cba89..4b339f1bf61 100644 --- a/doc/source/install/cinder-storage-install-rdo.rst +++ b/doc/source/install/cinder-storage-install-rdo.rst @@ -76,7 +76,7 @@ storage node, you must prepare the storage device. ``/dev/sdb`` device and rejects all other devices: .. path /etc/lvm/lvm.conf - .. code-block:: none + .. code-block:: bash devices { ... diff --git a/doc/source/install/cinder-storage-install-ubuntu.rst b/doc/source/install/cinder-storage-install-ubuntu.rst index 7eaa5f27697..8866c80a7dc 100644 --- a/doc/source/install/cinder-storage-install-ubuntu.rst +++ b/doc/source/install/cinder-storage-install-ubuntu.rst @@ -64,7 +64,7 @@ storage node, you must prepare the storage device. ``/dev/sdb`` device and rejects all other devices: .. path /etc/lvm/lvm.conf - .. code-block:: none + .. code-block:: bash devices { ... diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst index a93ae94f075..a88080c06cd 100644 --- a/doc/source/install/index.rst +++ b/doc/source/install/index.rst @@ -21,4 +21,5 @@ For more information, see the index-obs index-rdo - index-ubuntu \ No newline at end of file + index-ubuntu + diff --git a/driver-requirements.txt b/driver-requirements.txt index a79c1819d36..694d7709263 100644 --- a/driver-requirements.txt +++ b/driver-requirements.txt @@ -41,4 +41,5 @@ vmemclient>=1.1.8 # Apache-2.0 infinisdk # BSD-3 capacity # BSD infi.dtypes.wwn # PSF -infi.dtypes.iqn # PSF \ No newline at end of file +infi.dtypes.iqn # PSF +