Merge pull request #83 from stackhpc/upstream/yoga-2024-12-13

Synchronise yoga with upstream

Author: priteau

.zuul.yaml

@@ -44,6 +44,7 @@
               - ^doc/.*$
               - ^releasenotes/.*$
         - cinder-plugin-ceph-tempest:
+            voting: false
             irrelevant-files: &gate-irrelevant-files
               - ^(test-|)requirements.txt$
               - ^.*\.rst$
@@ -90,6 +91,7 @@
         - cinder-grenade-mn-sub-volbak:
             irrelevant-files: *gate-irrelevant-files
         - cinder-plugin-ceph-tempest:
+            voting: false
             irrelevant-files: *gate-irrelevant-files
         - tempest-integrated-storage:
             irrelevant-files: *gate-irrelevant-files

cinder/backup/drivers/swift.py

@@ -415,7 +415,8 @@ def check_for_setup_error(self):
                         "possible we could have problems because of it.")
             return
         conn = swift.Connection(retries=CONF.backup_swift_retry_attempts,
-                                preauthurl=CONF.backup_swift_url)
+                                preauthurl=CONF.backup_swift_url,
+                                cacert=CONF.backup_swift_ca_cert_file)
         try:
             conn.get_capabilities()
             # TODO(e0ne) catch less general exception