openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow use of any backup backend for any volume backend"

Browse Source
This commit is contained in:
Jenkins 2017-04-19 11:51:07 +00:00 committed by Gerrit Code Review
commit 0c9f6ae36f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/cinder/templates/cinder.conf.j2
View File

@ -21,7 +21,8 @@ os_region_name = {{ openstack_region_name }}
enabled_backends = {{ cinder_enabled_backends|map(attribute='name')|join(',') }} enabled_backends = {{ cinder_enabled_backends|map(attribute='name')|join(',') }}
{% endif %} {% endif %}
{% if service_name == "cinder-backup" and enable_ceph | bool and cinder_backend_ceph | bool %} {% if service_name == "cinder-backup" %}
{% if enable_ceph | bool and 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
@ -30,13 +31,13 @@ backup_ceph_pool = {{ ceph_cinder_backup_pool_name }}
backup_ceph_stripe_unit = 0 backup_ceph_stripe_unit = 0
backup_ceph_stripe_count = 0 backup_ceph_stripe_count = 0
restore_discard_excess_bytes = true restore_discard_excess_bytes = true
{% elif cinder_backup_driver == "nfs"%} {% elif cinder_backup_driver == "nfs" %}
backup_driver = cinder.backup.drivers.nfs backup_driver = cinder.backup.drivers.nfs
backup_mount_options = {{ cinder_backup_mount_options_nfs }} backup_mount_options = {{ cinder_backup_mount_options_nfs }}
backup_mount_point_base = /var/lib/cinder/backup backup_mount_point_base = /var/lib/cinder/backup
backup_share = {{ cinder_backup_share }} backup_share = {{ cinder_backup_share }}
backup_file_size = 327680000 backup_file_size = 327680000
{% elif cinder_backup_driver == "swift"%} {% elif enable_swift | bool and cinder_backup_driver == "swift" %}
backup_driver = cinder.backup.drivers.swift backup_driver = cinder.backup.drivers.swift
backup_swift_url = http://{{ kolla_internal_vip_address }}:{{ swift_proxy_server_port }}/v1/AUTH_ backup_swift_url = http://{{ kolla_internal_vip_address }}:{{ swift_proxy_server_port }}/v1/AUTH_
backup_swift_auth = per_user backup_swift_auth = per_user
@ -44,6 +45,7 @@ backup_swift_auth_version = 1
backup_swift_user = backup_swift_user =
backup_swift_key = backup_swift_key =
{% endif %} {% endif %}
{% endif %}
osapi_volume_listen = {{ api_interface_address }} osapi_volume_listen = {{ api_interface_address }}
osapi_volume_listen_port = {{ cinder_api_port }} osapi_volume_listen_port = {{ cinder_api_port }}