openstack/cinder
Code Issues Proposed changes

Merge "Fix controller install document indentation"

Browse Source
This commit is contained in:
Zuul 2017-11-18 02:31:04 +00:00 committed by Gerrit Code Review
commit 4e2cb7d0eb
3 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
doc/source/install/cinder-controller-install-obs.rst
View File

@ -74,9 +74,9 @@ must create a database, service credentials, and API endpoints.
$ openstack role add --project service --user cinder admin $ openstack role add --project service --user cinder admin
.. note:: .. note::
This command provides no output. This command provides no output.
#. Create the ``cinderv2`` and ``cinderv3`` service entities: #. Create the ``cinderv2`` and ``cinderv3`` service entities:
@ -265,27 +265,27 @@ Install and configure components
Replace ``RABBIT_PASS`` with the password you chose for the 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, #. In the ``[DEFAULT]`` and ``[keystone_authtoken]`` sections,
configure Identity service access: configure Identity service access:
.. path /etc/cinder/cinder.conf .. path /etc/cinder/cinder.conf
.. code-block:: ini .. code-block:: ini
[DEFAULT] [DEFAULT]
# ... # ...
auth_strategy = keystone auth_strategy = keystone
[keystone_authtoken] [keystone_authtoken]
# ... # ...
auth_uri = http://controller:5000 auth_uri = http://controller:5000
auth_url = http://controller:35357 auth_url = http://controller:35357
memcached_servers = controller:11211 memcached_servers = controller:11211
auth_type = password auth_type = password
project_domain_name = default project_domain_name = default
user_domain_name = default user_domain_name = default
project_name = service project_name = service
username = cinder username = cinder
password = CINDER_PASS password = CINDER_PASS
Replace ``CINDER_PASS`` with the password you chose for Replace ``CINDER_PASS`` with the password you chose for
the ``cinder`` user in the Identity service. the ``cinder`` user in the Identity service.

18
doc/source/install/cinder-controller-install-rdo.rst
View File

@ -110,9 +110,9 @@ must create a database, service credentials, and API endpoints.
| type | volumev3 | | type | volumev3 |
+-------------+----------------------------------+ +-------------+----------------------------------+
.. note:: .. note::
The Block Storage services require two service entities. The Block Storage services require two service entities.
#. Create the Block Storage service API endpoints: #. Create the Block Storage service API endpoints:
@ -241,15 +241,15 @@ Install and configure components
#. In the ``[database]`` section, configure database access: #. In the ``[database]`` section, configure database access:
.. path /etc/cinder/cinder.conf .. path /etc/cinder/cinder.conf
.. code-block:: ini .. code-block:: ini
[database] [database]
# ... # ...
connection = mysql+pymysql://cinder:CINDER_DBPASS@controller/cinder connection = mysql+pymysql://cinder:CINDER_DBPASS@controller/cinder
Replace ``CINDER_DBPASS`` with the password you chose for the Replace ``CINDER_DBPASS`` with the password you chose for the
Block Storage database. Block Storage database.
#. In the ``[DEFAULT]`` section, configure ``RabbitMQ`` #. In the ``[DEFAULT]`` section, configure ``RabbitMQ``
message queue access: message queue access:

118
doc/source/install/cinder-controller-install-ubuntu.rst
View File

@ -24,20 +24,20 @@ must create a database, service credentials, and API endpoints.
#. Create the ``cinder`` database: #. Create the ``cinder`` database:
.. code-block:: console .. code-block:: console
MariaDB [(none)]> CREATE DATABASE cinder; MariaDB [(none)]> CREATE DATABASE cinder;
#. Grant proper access to the ``cinder`` database: #. Grant proper access to the ``cinder`` database:
.. code-block:: console .. code-block:: console
MariaDB [(none)]> GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'localhost' \ MariaDB [(none)]> GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'localhost' \
IDENTIFIED BY 'CINDER_DBPASS'; IDENTIFIED BY 'CINDER_DBPASS';
MariaDB [(none)]> GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'%' \ MariaDB [(none)]> GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'%' \
IDENTIFIED BY 'CINDER_DBPASS'; IDENTIFIED BY 'CINDER_DBPASS';
Replace ``CINDER_DBPASS`` with a suitable password. Replace ``CINDER_DBPASS`` with a suitable password.
#. Exit the database access client. #. Exit the database access client.
@ -52,64 +52,64 @@ must create a database, service credentials, and API endpoints.
#. Create a ``cinder`` user: #. Create a ``cinder`` user:
.. code-block:: console .. code-block:: console
$ openstack user create --domain default --password-prompt cinder $ openstack user create --domain default --password-prompt cinder
User Password: User Password:
Repeat User Password: Repeat User Password:
+---------------------+----------------------------------+ +---------------------+----------------------------------+
| Field | Value | | Field | Value |
+---------------------+----------------------------------+ +---------------------+----------------------------------+
| domain_id | default | | domain_id | default |
| enabled | True | | enabled | True |
| id | 9d7e33de3e1a498390353819bc7d245d | | id | 9d7e33de3e1a498390353819bc7d245d |
| name | cinder | | name | cinder |
| options | {} | | options | {} |
| password_expires_at | None | | password_expires_at | None |
+---------------------+----------------------------------+ +---------------------+----------------------------------+
#. Add the ``admin`` role to the ``cinder`` user: #. Add the ``admin`` role to the ``cinder`` user:
.. code-block:: console .. code-block:: console
$ openstack role add --project service --user cinder admin $ openstack role add --project service --user cinder admin
.. note:: .. note::
This command provides no output. This command provides no output.
#. Create the ``cinderv2`` and ``cinderv3`` service entities: #. Create the ``cinderv2`` and ``cinderv3`` service entities:
.. code-block:: console .. code-block:: console
$ openstack service create --name cinderv2 \ $ openstack service create --name cinderv2 \
--description "OpenStack Block Storage" volumev2 --description "OpenStack Block Storage" volumev2
+-------------+----------------------------------+ +-------------+----------------------------------+
| Field | Value | | Field | Value |
+-------------+----------------------------------+ +-------------+----------------------------------+
| description | OpenStack Block Storage | | description | OpenStack Block Storage |
| enabled | True | | enabled | True |
| id | eb9fd245bdbc414695952e93f29fe3ac | | id | eb9fd245bdbc414695952e93f29fe3ac |
| name | cinderv2 | | name | cinderv2 |
| type | volumev2 | | type | volumev2 |
+-------------+----------------------------------+ +-------------+----------------------------------+
.. code-block:: console .. code-block:: console
$ openstack service create --name cinderv3 \ $ openstack service create --name cinderv3 \
--description "OpenStack Block Storage" volumev3 --description "OpenStack Block Storage" volumev3
+-------------+----------------------------------+ +-------------+----------------------------------+
| Field | Value | | Field | Value |
+-------------+----------------------------------+ +-------------+----------------------------------+
| description | OpenStack Block Storage | | description | OpenStack Block Storage |
| enabled | True | | enabled | True |
| id | ab3bbbef780845a1a283490d281e7fda | | id | ab3bbbef780845a1a283490d281e7fda |
| name | cinderv3 | | name | cinderv3 |
| type | volumev3 | | type | volumev3 |
+-------------+----------------------------------+ +-------------+----------------------------------+
.. note:: .. note::
@ -249,21 +249,21 @@ Install and configure components
# ... # ...
connection = mysql+pymysql://cinder:CINDER_DBPASS@controller/cinder connection = mysql+pymysql://cinder:CINDER_DBPASS@controller/cinder
Replace ``CINDER_DBPASS`` with the password you chose for the Replace ``CINDER_DBPASS`` with the password you chose for the
Block Storage database. Block Storage database.
#. In the ``[DEFAULT]`` section, configure ``RabbitMQ`` #. In the ``[DEFAULT]`` section, configure ``RabbitMQ``
message queue access: message queue access:
.. path /etc/cinder/cinder.conf .. path /etc/cinder/cinder.conf
.. code-block:: ini .. code-block:: ini
[DEFAULT] [DEFAULT]
# ... # ...
transport_url = rabbit://openstack:RABBIT_PASS@controller transport_url = rabbit://openstack:RABBIT_PASS@controller
Replace ``RABBIT_PASS`` with the password you chose for the 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, #. In the ``[DEFAULT]`` and ``[keystone_authtoken]`` sections,
configure Identity service access: configure Identity service access: