summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErno Kuvaja <jokke@usr.fi>2022-08-30 13:35:51 +0100
committerErno Kuvaja <jokke@usr.fi>2022-08-30 13:35:51 +0100
commite4fd087a8448fd3305dcebcf5368a5c7d194c1ea (patch)
treee4b95e868c394fb627e1dc55a762fae43aa2aebd
parent51e4fb1485b7c3c69ea90b3cea901dc446c5cc50 (diff)
downloadglance-e4fd087a8448fd3305dcebcf5368a5c7d194c1ea.tar.gz
Minor fix on Interoperable Image Import admin doc
The III admin doc has grown quite a bit and multiple sections misleadingly referred that all above options needed to be configured as if different import-methods depended on eachother. Also correcting the statement of default enabled methods. Change-Id: I19485c1d6bb22e81a8496ddab312e9458ae3cbee
-rw-r--r--doc/source/admin/interoperable-image-import.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/source/admin/interoperable-image-import.rst b/doc/source/admin/interoperable-image-import.rst
index ba91b1438..468b5de72 100644
--- a/doc/source/admin/interoperable-image-import.rst
+++ b/doc/source/admin/interoperable-image-import.rst
@@ -81,7 +81,7 @@ Image Import Methods
Glance provides four import methods that you can make available to your
users: ``glance-direct``, ``web-download``, ``glance-download``, and
-``copy-image``. By default, all four methods are enabled.
+``copy-image``. By default, ``glance-download`` is not enabled.
* The ``glance-direct`` import method allows your users to upload image data
directly to Glance.
@@ -162,8 +162,8 @@ Configuring the glance-direct method
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
For the ``glance-direct`` method, make sure that ``glance-direct`` is included
-in the list specified by your ``enabled_import_methods`` setting, and that all
-the options described above are set properly.
+in the list specified by your ``enabled_import_methods`` setting, and that
+staging directory config options are set properly.
Note that in order to use ``glance-direct``, the
``worker_self_reference_url`` configuration option must be set as
@@ -174,8 +174,8 @@ Configuring the web-download method
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
To enable the ``web-download`` import method, make sure that it is included in
-the list of methods in the ``enabled_import_methods`` option, and that all the
-options described above are set properly.
+the list of methods in the ``enabled_import_methods`` option, and that staging
+directory config options are set properly.
Additionally, you have the following configuration available.
@@ -269,8 +269,8 @@ Configuring the glance-download method
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
To enable the ``glance-download`` import method, make sure that it is included
-in the list of methods in the ``enabled_import_methods`` option, and that all
-the options described above are set properly.
+in the list of methods in the ``enabled_import_methods`` option, and that
+staging directory config options are set properly.
Additionally, you have the following configuration available.