From b7fe60fc4d655e60ab1c19ef4a5b390d282554da Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Wed, 27 Jul 2022 06:52:22 +0000
Subject: [PATCH] Revert "Allow cinder-backup to be configured to use S3
backend."
This reverts commit 73fc230fe3f1d159b5bb9d62a6e15f93cecb6e7c.
Reason for revert: CI jobs failing with "msg": "{{ s3_url }}: 's3_url' is undefined"
Change-Id: Iba7099988cea0c0d8254b9e202309cd9c82a984d
---
ansible/group_vars/all.yml | 2 +-
ansible/roles/cinder/defaults/main.yml | 8 --------
ansible/roles/cinder/templates/cinder.conf.j2 | 6 ------
etc/kolla/globals.yml | 8 +-------
releasenotes/notes/s3-cinder-backup-180f57b6d0e417f2.yaml | 3 ---
5 files changed, 2 insertions(+), 25 deletions(-)
delete mode 100644 releasenotes/notes/s3-cinder-backup-180f57b6d0e417f2.yaml
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 4feed4c918..0f370feab0 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -940,7 +940,7 @@ cinder_target_helper: "{{ 'lioadm' if ansible_facts.os_family == 'RedHat' else '
# 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, s3 ]
+# Valid options are [ nfs, swift, ceph ]
cinder_backup_driver: "ceph"
cinder_backup_share: ""
cinder_backup_mount_options_nfs: ""
diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml
index ce8e1600ef..fa29ffb46c 100644
--- a/ansible/roles/cinder/defaults/main.yml
+++ b/ansible/roles/cinder/defaults/main.yml
@@ -271,14 +271,6 @@ pure_fc_backend: "pure_fc_backend"
pure_api_token:
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
####################
diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index 56c425dde2..355b53696f 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -47,12 +47,6 @@ backup_swift_auth = per_user
backup_swift_auth_version = 1
backup_swift_user =
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 %}
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 13e7259156..f80dc13c2f 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -518,17 +518,11 @@ 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, s3 ]
+# Valid options are [ nfs, swift, ceph ]
#cinder_backup_driver: "ceph"
#cinder_backup_share: ""
#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
#######################
diff --git a/releasenotes/notes/s3-cinder-backup-180f57b6d0e417f2.yaml b/releasenotes/notes/s3-cinder-backup-180f57b6d0e417f2.yaml
deleted file mode 100644
index a3353bf9d5..0000000000
--- a/releasenotes/notes/s3-cinder-backup-180f57b6d0e417f2.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-features:
- - Allow cinder-backup to be configured to use S3 backend.