diff --git a/doc/source/admin/quotas.rst b/doc/source/admin/quotas.rst index 5a79eeaa84..71b4855d08 100644 --- a/doc/source/admin/quotas.rst +++ b/doc/source/admin/quotas.rst @@ -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 diff --git a/doc/source/install/install-debian.rst b/doc/source/install/install-debian.rst index eba3309d43..b233541700 100644 --- a/doc/source/install/install-debian.rst +++ b/doc/source/install/install-debian.rst @@ -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 -------------------------------- diff --git a/doc/source/install/install-obs.rst b/doc/source/install/install-obs.rst index f3a84c7eb2..2a1d428e14 100644 --- a/doc/source/install/install-obs.rst +++ b/doc/source/install/install-obs.rst @@ -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 -------------------------------- diff --git a/doc/source/install/install-rdo.rst b/doc/source/install/install-rdo.rst index 5d573ef1ec..64b0af3b6e 100644 --- a/doc/source/install/install-rdo.rst +++ b/doc/source/install/install-rdo.rst @@ -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 -------------------------------- diff --git a/doc/source/install/install-ubuntu.rst b/doc/source/install/install-ubuntu.rst index 3bcb4d69b9..d512bd9ef9 100644 --- a/doc/source/install/install-ubuntu.rst +++ b/doc/source/install/install-ubuntu.rst @@ -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 -------------------------------- diff --git a/doc/source/install/register-quotas.rst b/doc/source/install/register-quotas.rst index 260c04fe54..afc596fb34 100644 --- a/doc/source/install/register-quotas.rst +++ b/doc/source/install/register-quotas.rst @@ -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.