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

1 files changed, 25 insertions, 1 deletions

diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 223ec3bfa..3eec3ba45 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -435,6 +435,15 @@ workaround_ansible_issue_8743: yes
 #enable_watcher: "no"
 #enable_zun: "no"
 
+#############
+# S3 options
+#############
+# Common options for S3 Cinder Backup and Glance S3 backend.
+#s3_url:
+#s3_bucket:
+#s3_access_key:
+#s3_secret_key:
+
 ##################
 # RabbitMQ options
 ##################
@@ -513,6 +522,7 @@ workaround_ansible_issue_8743: yes
 #glance_backend_file: "yes"
 #glance_backend_swift: "no"
 #glance_backend_vmware: "no"
+#glance_backend_s3: "no"
 #enable_glance_image_cache: "no"
 #glance_enable_property_protection: "no"
 #glance_enable_interoperable_image_import: "no"
@@ -522,6 +532,14 @@ workaround_ansible_issue_8743: yes
 #glance_enable_rolling_upgrade: "no"
 
 ####################
+# Glance S3 Backend
+####################
+#glance_backend_s3_url: "{{ s3_url }}"
+#glance_backend_s3_bucket: "{{ s3_bucket }}"
+#glance_backend_s3_access_key: "{{ s3_access_key }}"
+#glance_backend_s3_secret_key: "{{ s3_secret_key }}"
+
+####################
 # Osprofiler options
 ####################
 # valid values: ["elasticsearch", "redis"]
@@ -554,11 +572,17 @@ workaround_ansible_issue_8743: yes
 # Valid options are [ '', redis, etcd ]
 #cinder_coordination_backend: "{{ 'redis' if enable_redis|bool else 'etcd' if enable_etcd|bool else '' }}"
 
-# Valid options are [ nfs, swift, ceph ]
+# Valid options are [ nfs, swift, ceph, s3 ]
 #cinder_backup_driver: "ceph"
 #cinder_backup_share: ""
 #cinder_backup_mount_options_nfs: ""
 
+# Cinder backup S3 options
+#cinder_backup_s3_url: "{{ s3_url }}"
+#cinder_backup_s3_bucket: "{{ s3_bucket }}"
+#cinder_backup_s3_access_key: "{{ s3_access_key }}"
+#cinder_backup_s3_secret_key: "{{ s3_secret_key }}"
+
 #######################
 # Cloudkitty options
 #######################