From 5beece250365c2ed763a319b7d544b26a5a184f3 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 1 Oct 2018 14:43:07 +0100 Subject: [PATCH] Fix Cinder backup driver Cinder has dropped [1] support for legacy backup services. It is now necessary to specify the full class of the backup driver, rather than just the module name. This was causing the kolla-ansible ceph jobs to fail. [1] https://review.openstack.org/#/c/595372 Change-Id: Icf0ee475ba73f013d4266332d999362651d9475b --- ansible/roles/cinder/templates/cinder.conf.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2 index f8da3255da..3f91806dc4 100644 --- a/ansible/roles/cinder/templates/cinder.conf.j2 +++ b/ansible/roles/cinder/templates/cinder.conf.j2 @@ -26,7 +26,7 @@ enabled_backends = {{ cinder_enabled_backends|map(attribute='name')|join(',') }} {% if service_name == "cinder-backup" and enable_cinder_backup | bool %} {% if cinder_backup_driver == "ceph" %} -backup_driver = cinder.backup.drivers.ceph +backup_driver = cinder.backup.drivers.ceph.CephBackupDriver backup_ceph_conf = /etc/ceph/ceph.conf backup_ceph_user = cinder-backup backup_ceph_chunk_size = 134217728 @@ -35,13 +35,13 @@ backup_ceph_stripe_unit = 0 backup_ceph_stripe_count = 0 restore_discard_excess_bytes = true {% elif cinder_backup_driver == "nfs" %} -backup_driver = cinder.backup.drivers.nfs +backup_driver = cinder.backup.drivers.nfs.NFSBackupDriver backup_mount_options = {{ cinder_backup_mount_options_nfs }} backup_mount_point_base = /var/lib/cinder/backup backup_share = {{ cinder_backup_share }} backup_file_size = 327680000 {% elif enable_swift | bool and cinder_backup_driver == "swift" %} -backup_driver = cinder.backup.drivers.swift +backup_driver = cinder.backup.drivers.swift.SwiftBackupDriver backup_swift_url = http://{{ kolla_internal_vip_address }}:{{ swift_proxy_server_port }}/v1/AUTH_ backup_swift_auth = per_user backup_swift_auth_version = 1