Merge "Fix Cinder backup to use full class path"

This commit is contained in:
Zuul 2018-11-13 08:37:29 +00:00 committed by Gerrit Code Review
commit b641b12c84
4 changed files with 18 additions and 6 deletions

View File

@ -191,9 +191,9 @@ cinder_keystone_auth_type: password
## In order to enable the cinder backup you MUST set ``cinder_service_backup_program_enabled`` to "true"
cinder_service_backup_program_enabled: false
# cinder_service_backup_driver: Options include 'cinder.backup.drivers.swift' or
# 'cinder.backup.drivers.ceph'
cinder_service_backup_driver: cinder.backup.drivers.swift
# cinder_service_backup_driver: Options include 'cinder.backup.drivers.swift.SwiftBackupDriver' or
# 'cinder.backup.drivers.ceph.CephBackupDriver'
cinder_service_backup_driver: cinder.backup.drivers.swift.SwiftBackupDriver
# cinder_service_backup_swift_auth: Options include 'per_user' or 'single_user', we default to
# 'per_user' so that backups are saved to a user's swift account.
cinder_service_backup_swift_auth: per_user

View File

@ -160,7 +160,7 @@ variable:
.. code-block:: yaml
cinder_service_backup_driver: cinder.backup.drivers.ceph
cinder_service_backup_driver: cinder.backup.drivers.ceph.CephBackupDriver
Configure the Ceph user and the pool to use for backups. The defaults
are shown here:

View File

@ -0,0 +1,12 @@
---
upgrade:
- |
In Stein, Cinder stopped supporting configuring backup drivers without
the full class path. This means that you must now use the following
values for ``cinder_service_backup_driver``.
* ``cinder.backup.drivers.swift.SwiftBackupDriver``
* ``cinder.backup.drivers.ceph.CephBackupDriver``
If you do not make this change, the Cinder backup service will refuse
to start properly.

View File

@ -21,7 +21,7 @@ auth_strategy = {{ cinder_auth_strategy }}
backup_driver = {{ cinder_service_backup_driver }}
backup_metadata_version = {{ cinder_service_backup_metadata_version }}
backup_compression_algorithm = {{ cinder_service_backup_compression_algorithm }}
{% if cinder_service_backup_driver == 'cinder.backup.drivers.swift' %}
{% if cinder_service_backup_driver == 'cinder.backup.drivers.swift.SwiftBackupDriver' %}
swift_catalog_info = {{ cinder_swift_catalog_info }}
backup_swift_auth = {{ cinder_service_backup_swift_auth }}
{% if cinder_service_backup_swift_auth == 'single_user' %}
@ -35,7 +35,7 @@ backup_swift_container = {{ cinder_service_backup_swift_container }}
backup_swift_object_size = {{ cinder_service_backup_swift_object_size }}
backup_swift_retry_attempts = {{ cinder_service_backup_swift_retry_attempts }}
backup_swift_retry_backoff = {{ cinder_service_backup_swift_retry_backoff }}
{% elif cinder_service_backup_driver == 'cinder.backup.drivers.ceph' %}
{% elif cinder_service_backup_driver == 'cinder.backup.drivers.ceph.CephBackupDriver' %}
backup_ceph_user = {{ cinder_service_backup_ceph_user }}
backup_ceph_pool = {{ cinder_service_backup_ceph_pool }}
{% endif %}