Merge "Deploy Glance and Cinder Backup with S3 backend support"

2 files changed, 56 insertions, 0 deletions

diff --git a/doc/source/reference/shared-services/glance-guide.rst b/doc/source/reference/shared-services/glance-guide.rst
index 89b82bb6f..48e8774aa 100644
--- a/doc/source/reference/shared-services/glance-guide.rst
+++ b/doc/source/reference/shared-services/glance-guide.rst
@@ -63,6 +63,34 @@ To enable the vmware backend manually:
 
    glance_backend_vmware: "yes"
 
+Glance with S3 Backend
+~~~~~~~~~~~~~~~~~~~~~~
+
+Configuring Glance for S3 includes the following steps:
+
+#. Enable Glance S3 backend in ``globals.yml``:
+
+.. code-block:: yaml
+
+   glance_backend_s3: "yes"
+
+#. Configure S3 connection details in ``/etc/kolla/globals.yml``:
+
+   * ``glance_backend_s3_url`` (example: ``http://127.0.0.1:9000``)
+   * ``glance_backend_s3_access_key`` (example: ``minio``)
+   * ``glance_backend_s3_bucket`` (example: ``glance``)
+   * ``glance_backend_s3_secret_key`` (example: ``admin``)
+
+#. If you wish to use a single S3 backend for all supported services,
+use the following variables:
+
+   * ``s3_url``
+   * ``s3_access_key``
+   * ``s3_glance_bucket``
+   * ``s3_secret_key``
+
+   All Glance S3 configurations use these options as default values.
+
 Swift backend
 ~~~~~~~~~~~~~
 
diff --git a/doc/source/reference/storage/cinder-guide.rst b/doc/source/reference/storage/cinder-guide.rst
index 18f36d5f7..49f16405c 100644
--- a/doc/source/reference/storage/cinder-guide.rst
+++ b/doc/source/reference/storage/cinder-guide.rst
@@ -201,6 +201,34 @@ in Kolla, the following parameter must be specified in ``globals.yml``:
 All configuration for custom NFS backend should be performed
 via ``cinder.conf`` in config overrides directory.
 
+Cinder-Backup with S3 Backend
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Configuring Cinder-Backup for S3 includes the following steps:
+
+#. Enable Cinder-Backup S3 backend in ``globals.yml``:
+
+.. code-block:: yaml
+
+   cinder_backup_driver: "s3"
+
+#. Configure S3 connection details in ``/etc/kolla/globals.yml``:
+
+   * ``cinder_backup_s3_url`` (example: ``http://127.0.0.1:9000``)
+   * ``cinder_backup_s3_access_key`` (example: ``minio``)
+   * ``cinder_backup_s3_bucket`` (example: ``cinder``)
+   * ``cinder_backup_s3_secret_key`` (example: ``admin``)
+
+#. If you wish to use a single S3 backend for all supported services,
+use the following variables:
+
+   * ``s3_url``
+   * ``s3_access_key``
+   * ``s3_glance_bucket``
+   * ``s3_secret_key``
+
+   All Cinder-Backup S3 configurations use these options as default values.
+
 Customizing backend names in cinder.conf
 ----------------------------------------