openstack/openstack-ansible-os_cinder
Code Issues Proposed changes

Fix Cinder backup to use full class path

Browse Source 
Cinder no longer supports using a driver name without
specifying the full class path.

This patch fixes all the documentation and adds a
release note for that.

Change-Id: Ia31748e3abb0fca54efd5e8e74bde0440760159e
Related-Change-Id: I3ada2dee1857074746b1893b82dd5f6641c6e579
This commit is contained in:
Mohammed Naser 2018-09-27 15:21:36 -04:00 committed by Jesse Pretorius (odyssey4me)
parent 9cd2f62e81
commit e5d5116ac5
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
defaults/main.yml
View File

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

2
doc/source/configure-cinder.rst
View File

@ -160,7 +160,7 @@ variable:
.. code-block:: yaml .. 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 Configure the Ceph user and the pool to use for backups. The defaults
are shown here: are shown here:

12
releasenotes/notes/backup-driver-rename-ca4424a0814ee8af.yaml Normal file
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.

4
templates/cinder.conf.j2
View File

@ -21,7 +21,7 @@ auth_strategy = {{ cinder_auth_strategy }}
backup_driver = {{ cinder_service_backup_driver }} backup_driver = {{ cinder_service_backup_driver }}
backup_metadata_version = {{ cinder_service_backup_metadata_version }} backup_metadata_version = {{ cinder_service_backup_metadata_version }}
backup_compression_algorithm = {{ cinder_service_backup_compression_algorithm }} 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 }} swift_catalog_info = {{ cinder_swift_catalog_info }}
backup_swift_auth = {{ cinder_service_backup_swift_auth }} backup_swift_auth = {{ cinder_service_backup_swift_auth }}
{% if cinder_service_backup_swift_auth == 'single_user' %} {% 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_object_size = {{ cinder_service_backup_swift_object_size }}
backup_swift_retry_attempts = {{ cinder_service_backup_swift_retry_attempts }} backup_swift_retry_attempts = {{ cinder_service_backup_swift_retry_attempts }}
backup_swift_retry_backoff = {{ cinder_service_backup_swift_retry_backoff }} 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_user = {{ cinder_service_backup_ceph_user }}
backup_ceph_pool = {{ cinder_service_backup_ceph_pool }} backup_ceph_pool = {{ cinder_service_backup_ceph_pool }}
{% endif %} {% endif %}