openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add more options for cinder-backup."

Browse Source
This commit is contained in:
Jenkins 2016-11-30 17:35:40 +00:00 committed by Gerrit Code Review
commit 44e11dd10b
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/group_vars/all.yml
View File

@ -378,6 +378,9 @@ gnocchi_backend_storage: "{{ 'ceph' if enable_ceph|bool else 'file' }}"
################################# #################################
cinder_backend_ceph: "{{ enable_ceph }}" cinder_backend_ceph: "{{ enable_ceph }}"
cinder_volume_group: "cinder-volumes" cinder_volume_group: "cinder-volumes"
cinder_backup_driver: "nfs"
cinder_backup_share: ""
cinder_backup_mount_options_nfs: ""
####################### #######################
# Cloudkitty options # Cloudkitty options

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

@ -32,6 +32,19 @@ 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"%}
backup_driver = cinder.backup.drivers.nfs
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 cinder_backup_driver == "swift"%}
backup_driver = cinder.backup.drivers.swift
backup_swift_url = http://{{ kolla_internal_vip_address }}:{{ swift_proxy_server_port }}/v1/AUTH_
backup_swift_auth = per_user
backup_swift_auth_version = 1
backup_swift_user =
backup_swift_key =
{% endif %} {% endif %}
osapi_volume_listen = {{ api_interface_address }} osapi_volume_listen = {{ api_interface_address }}

5
etc/kolla/globals.yml
View File

@ -213,9 +213,10 @@ kolla_internal_vip_address: "10.10.10.254"
################################# #################################
# Enable / disable Cinder backends # Enable / disable Cinder backends
#cinder_backend_ceph: "{{ enable_ceph }}" #cinder_backend_ceph: "{{ enable_ceph }}"
#cinder_volume_group: "cinder-volumes" #cinder_volume_group: "cinder-volumes"
#cinder_backup_driver: "nfs"
#cinder_backup_share: ""
#cinder_backup_mount_options_nfs: ""
######################### #########################
# Nova - Compute Options # Nova - Compute Options