Correct item numbering in install docs
Indicating a new enumerated point by a '#.' in an included doc restarts the numbering at 1 instead of continuing the current sequence. Move the '#.' sentence out of the included doc and into the individual install docs so that the points are enumerated correctly. Also remove one level of indentation from the included file and instead indent the 'include' directive. (Also had to break two lines in register-quotas.rst due to doc8 D001. Not sure why that suddenly broke now after I shortened all the lines in that file!) Change-Id: I53c136c728fcffbca07eb5d0a67f9edc5e723ad0
This commit is contained in:
parent
97551b953b
commit
2fd57d68f5
@ -156,7 +156,9 @@ be able to upload data to any images.
|
||||
Configuring Glance for Per-Tenant Quotas
|
||||
----------------------------------------
|
||||
|
||||
.. include:: ../install/register-quotas.rst
|
||||
#. Register quota limits (optional):
|
||||
|
||||
.. include:: ../install/register-quotas.rst
|
||||
|
||||
#. Tell Glance to use Keystone quotas
|
||||
|
||||
|
@ -166,7 +166,9 @@ create a database, service credentials, and API endpoints.
|
||||
|
||||
.. end
|
||||
|
||||
.. include:: register-quotas.rst
|
||||
#. Register quota limits (optional):
|
||||
|
||||
.. include:: register-quotas.rst
|
||||
|
||||
Install and configure components
|
||||
--------------------------------
|
||||
|
@ -166,7 +166,9 @@ create a database, service credentials, and API endpoints.
|
||||
|
||||
.. end
|
||||
|
||||
.. include:: register-quotas.rst
|
||||
#. Register quota limits (optional):
|
||||
|
||||
.. include:: register-quotas.rst
|
||||
|
||||
Install and configure components
|
||||
--------------------------------
|
||||
|
@ -166,7 +166,9 @@ create a database, service credentials, and API endpoints.
|
||||
|
||||
.. end
|
||||
|
||||
.. include:: register-quotas.rst
|
||||
#. Register quota limits (optional):
|
||||
|
||||
.. include:: register-quotas.rst
|
||||
|
||||
Install and configure components
|
||||
--------------------------------
|
||||
|
@ -166,7 +166,9 @@ create a database, service credentials, and API endpoints.
|
||||
|
||||
.. end
|
||||
|
||||
.. include:: register-quotas.rst
|
||||
#. Register quota limits (optional):
|
||||
|
||||
.. include:: register-quotas.rst
|
||||
|
||||
Install and configure components
|
||||
--------------------------------
|
||||
|
@ -1,66 +1,66 @@
|
||||
#. Register quota limits (optional):
|
||||
If you decide to use per-tenant quotas in Glance, you must register
|
||||
the limits in Keystone first:
|
||||
|
||||
If you decide to use per-tenant quotas in Glance, you must register
|
||||
the limits in Keystone first:
|
||||
.. code-block:: console
|
||||
|
||||
.. code-block:: console
|
||||
$ openstack --os-cloud devstack-system-admin registered limit create \
|
||||
--service glance --default-limit 1000 --region RegionOne image_size_total
|
||||
|
||||
$ openstack --os-cloud devstack-system-admin registered limit create \
|
||||
--service glance --default-limit 1000 --region RegionOne image_size_total
|
||||
+---------------+----------------------------------+
|
||||
| Field | Value |
|
||||
+---------------+----------------------------------+
|
||||
| default_limit | 1000 |
|
||||
| description | None |
|
||||
| id | 9cedfc5de80345a9b13ed00c2b5460f2 |
|
||||
| region_id | RegionOne |
|
||||
| resource_name | image_size_total |
|
||||
| service_id | e38c84a2487f49fd9864193bdc8a3174 |
|
||||
+---------------+----------------------------------+
|
||||
|
||||
+---------------+----------------------------------+
|
||||
| Field | Value |
|
||||
+---------------+----------------------------------+
|
||||
| default_limit | 1000 |
|
||||
| description | None |
|
||||
| id | 9cedfc5de80345a9b13ed00c2b5460f2 |
|
||||
| region_id | RegionOne |
|
||||
| resource_name | image_size_total |
|
||||
| service_id | e38c84a2487f49fd9864193bdc8a3174 |
|
||||
+---------------+----------------------------------+
|
||||
$ openstack --os-cloud devstack-system-admin registered limit create \
|
||||
--service glance --default-limit 1000 --region RegionOne image_stage_total
|
||||
|
||||
$ openstack --os-cloud devstack-system-admin registered limit create \
|
||||
--service glance --default-limit 1000 --region RegionOne image_stage_total
|
||||
+---------------+----------------------------------+
|
||||
| Field | Value |
|
||||
+---------------+----------------------------------+
|
||||
| default_limit | 1000 |
|
||||
| description | None |
|
||||
| id | 5a68712b6ba6496d823d0c66e5e860b9 |
|
||||
| region_id | RegionOne |
|
||||
| resource_name | image_stage_total |
|
||||
| service_id | e38c84a2487f49fd9864193bdc8a3174 |
|
||||
+---------------+----------------------------------+
|
||||
|
||||
+---------------+----------------------------------+
|
||||
| Field | Value |
|
||||
+---------------+----------------------------------+
|
||||
| default_limit | 1000 |
|
||||
| description | None |
|
||||
| id | 5a68712b6ba6496d823d0c66e5e860b9 |
|
||||
| region_id | RegionOne |
|
||||
| resource_name | image_stage_total |
|
||||
| service_id | e38c84a2487f49fd9864193bdc8a3174 |
|
||||
+---------------+----------------------------------+
|
||||
$ openstack --os-cloud devstack-system-admin registered limit create \
|
||||
--service glance --default-limit 100 --region RegionOne image_count_total
|
||||
|
||||
$ openstack --os-cloud devstack-system-admin registered limit create \
|
||||
--service glance --default-limit 100 --region RegionOne image_count_total
|
||||
+---------------+----------------------------------+
|
||||
| Field | Value |
|
||||
+---------------+----------------------------------+
|
||||
| default_limit | 100 |
|
||||
| description | None |
|
||||
| id | beb91b043296499f8e6268f29d8b2749 |
|
||||
| region_id | RegionOne |
|
||||
| resource_name | image_count_total |
|
||||
| service_id | e38c84a2487f49fd9864193bdc8a3174 |
|
||||
+---------------+----------------------------------+
|
||||
|
||||
+---------------+----------------------------------+
|
||||
| Field | Value |
|
||||
+---------------+----------------------------------+
|
||||
| default_limit | 100 |
|
||||
| description | None |
|
||||
| id | beb91b043296499f8e6268f29d8b2749 |
|
||||
| region_id | RegionOne |
|
||||
| resource_name | image_count_total |
|
||||
| service_id | e38c84a2487f49fd9864193bdc8a3174 |
|
||||
+---------------+----------------------------------+
|
||||
$ openstack --os-cloud devstack-system-admin registered limit create \
|
||||
--service glance --default-limit 100 --region RegionOne \
|
||||
image_count_uploading
|
||||
|
||||
$ openstack --os-cloud devstack-system-admin registered limit create \
|
||||
--service glance --default-limit 100 --region RegionOne image_count_uploading
|
||||
+---------------+----------------------------------+
|
||||
| Field | Value |
|
||||
+---------------+----------------------------------+
|
||||
| default_limit | 100 |
|
||||
| description | None |
|
||||
| id | fc29649c047a45bf9bc03ec4a7bcb8af |
|
||||
| region_id | RegionOne |
|
||||
| resource_name | image_count_uploading |
|
||||
| service_id | e38c84a2487f49fd9864193bdc8a3174 |
|
||||
+---------------+----------------------------------+
|
||||
|
||||
+---------------+----------------------------------+
|
||||
| Field | Value |
|
||||
+---------------+----------------------------------+
|
||||
| default_limit | 100 |
|
||||
| description | None |
|
||||
| id | fc29649c047a45bf9bc03ec4a7bcb8af |
|
||||
| region_id | RegionOne |
|
||||
| resource_name | image_count_uploading |
|
||||
| service_id | e38c84a2487f49fd9864193bdc8a3174 |
|
||||
+---------------+----------------------------------+
|
||||
.. end
|
||||
|
||||
.. end
|
||||
|
||||
Be sure to also set ``use_keystone_limits=True`` in your ``glance-api.conf`` file.
|
||||
Be sure to also set ``use_keystone_limits=True`` in your ``glance-api.conf``
|
||||
file.
|
||||
|
Loading…
Reference in New Issue
Block a user