Merge "Allow use of external ceph as cinder backup backend"

This commit is contained in:
Jenkins 2017-10-09 11:22:48 +00:00 committed by Gerrit Code Review
commit ce32e43e18

View File

@ -25,7 +25,7 @@ enabled_backends = {{ cinder_enabled_backends|map(attribute='name')|join(',') }}
{% endif %} {% endif %}
{% if service_name == "cinder-backup" and enable_cinder_backup | bool %} {% if service_name == "cinder-backup" and enable_cinder_backup | bool %}
{% if enable_ceph | bool and cinder_backup_driver == "ceph" %} {% if cinder_backup_driver == "ceph" %}
backup_driver = cinder.backup.drivers.ceph backup_driver = cinder.backup.drivers.ceph
backup_ceph_conf = /etc/ceph/ceph.conf backup_ceph_conf = /etc/ceph/ceph.conf
backup_ceph_user = cinder-backup backup_ceph_user = cinder-backup