openstack/kolla-ansible
Code Issues Proposed changes

Revert "Allow cinder-backup to be configured to use S3 backend."

Browse Source 
This reverts commit 73fc230fe3.

Reason for revert: CI jobs failing with "msg": "{{ s3_url }}: 's3_url' is undefined"

Change-Id: Iba7099988cea0c0d8254b9e202309cd9c82a984d
This commit is contained in:
Michal Nasiadka
2022-07-27 06:52:22 +00:00
parent 73fc230fe3
commit b7fe60fc4d
5 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all.yml
View File

@@ -940,7 +940,7 @@ cinder_target_helper: "{{ 'lioadm' if ansible_facts.os_family == 'RedHat' else '
# Valid options are [ '', redis, etcd ] # Valid options are [ '', redis, etcd ]
cinder_coordination_backend: "{{ 'redis' if enable_redis|bool else 'etcd' if enable_etcd|bool else '' }}" cinder_coordination_backend: "{{ 'redis' if enable_redis|bool else 'etcd' if enable_etcd|bool else '' }}"
# Valid options are [ nfs, swift, ceph, s3 ] # Valid options are [ nfs, swift, ceph ]
cinder_backup_driver: "ceph" cinder_backup_driver: "ceph"
cinder_backup_share: "" cinder_backup_share: ""
cinder_backup_mount_options_nfs: "" cinder_backup_mount_options_nfs: ""

8
ansible/roles/cinder/defaults/main.yml
View File

@@ -271,14 +271,6 @@ pure_fc_backend: "pure_fc_backend"
pure_api_token: pure_api_token:
pure_san_ip: pure_san_ip:
################################
# Cinder Backup S3
################################
cinder_backup_s3_endpoint: "{{ s3_url }}"
cinder_backup_s3_store_bucket: "volumebackups"
cinder_backup_s3_store_access_key: "{{ s3_access_key }}"
cinder_backup_s3_store_secret_key: "{{ s3_secret_key }}"
#################### ####################
# Kolla # Kolla
#################### ####################

6
ansible/roles/cinder/templates/cinder.conf.j2
View File

@@ -47,12 +47,6 @@ backup_swift_auth = per_user
backup_swift_auth_version = 1 backup_swift_auth_version = 1
backup_swift_user = backup_swift_user =
backup_swift_key = backup_swift_key =
{% elif cinder_backup_driver == "s3" %}
backup_driver = cinder.backup.drivers.s3.S3BackupDriver
backup_s3_endpoint_url = {{ cinder_backup_s3_endpoint }}
backup_s3_store_bucket = {{ cinder_backup_s3_store_bucket }}
backup_s3_store_access_key = {{ cinder_backup_s3_store_access_key }}
backup_s3_store_secret_key = {{ cinder_backup_s3_store_secret_key }}
{% endif %} {% endif %}
{% endif %} {% endif %}

8
etc/kolla/globals.yml
View File

@@ -518,17 +518,11 @@ workaround_ansible_issue_8743: yes
# Valid options are [ '', redis, etcd ] # Valid options are [ '', redis, etcd ]
#cinder_coordination_backend: "{{ 'redis' if enable_redis|bool else 'etcd' if enable_etcd|bool else '' }}" #cinder_coordination_backend: "{{ 'redis' if enable_redis|bool else 'etcd' if enable_etcd|bool else '' }}"
# Valid options are [ nfs, swift, ceph, s3 ] # Valid options are [ nfs, swift, ceph ]
#cinder_backup_driver: "ceph" #cinder_backup_driver: "ceph"
#cinder_backup_share: "" #cinder_backup_share: ""
#cinder_backup_mount_options_nfs: "" #cinder_backup_mount_options_nfs: ""
# Cinder backup S3 options
#cinder_backup_s3_endpoint: "{{ s3_url }}"
#cinder_backup_s3_store_bucket: "volumebackups"
#cinder_backup_s3_store_access_key: "{{ s3_access_key }}"
#cinder_backup_s3_store_secret_key: "{{ s3_secret_key }}"
####################### #######################
# Cloudkitty options # Cloudkitty options
####################### #######################

3
releasenotes/notes/s3-cinder-backup-180f57b6d0e417f2.yaml
View File

@@ -1,3 +0,0 @@
---
features:
- Allow cinder-backup to be configured to use S3 backend.