openstack
/
cinder
Code Issues Proposed changes

Merge "S3 Backup: Warn if verify_ssl is true with no cert file"

This commit is contained in:
Zuul 2023-01-23 20:06:25 +00:00 committed by Gerrit Code Review
parent 4c9b76b937 d2b516d378
commit bc45f0ebb6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/backup/drivers/s3.py
View File

@ -199,6 +199,10 @@ class S3BackupDriver(chunkeddriver.ChunkedBackupDriver):
'config': Config(**config_args)}
if CONF.backup_s3_verify_ssl:
conn_args['verify'] = CONF.backup_s3_ca_cert_file
if CONF.backup_s3_ca_cert_file is None:
LOG.warning('backup_s3_verify_ssl is True but no cert file '
'was provided')
else:
conn_args['verify'] = False
self.conn = boto3.client('s3', **conn_args)