openstack
/
openstack-ansible-os_tempest
Code Issues Proposed changes

Merge "Refresh multi-backend variables"

This commit is contained in:
Jenkins 2017-02-16 14:24:28 +00:00 committed by Gerrit Code Review
parent 2e40a0ec9f 28d2535227
commit 76e8607a4c
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -134,8 +134,7 @@ tempest_swift_discoverable_apis:
- slo
- tempurl
tempest_volume_backend1_name: backend1
tempest_volume_backend2_name: backend2
tempest_volume_backend_names: [ backend1, backend2 ]
tempest_volume_backup_enabled: False
tempest_volume_multi_backend_enabled: False

9
releasenotes/notes/update-multi-backend-options-4eb27290058401d3.yaml Normal file
View File

@ -0,0 +1,9 @@
---
features:
- Added new variable ``tempest_volume_backend_names`` and updated
templates/tempest.conf.j2 to point ``backend_names`` at this variable
deprecations:
- Removed ``tempest_volume_backend1_name`` and
``tempest_volume_backend1_name`` since ``backend1_name`` and
``backend2_name`` were removed from tempest in commit 27905cc (merged
26/04/2016)

4
templates/tempest.conf.j2
View File

@ -162,9 +162,7 @@ floating_ip_range = 10.0.0.0/29
[volume]
endpoint_type = internalURL
# NOTE: These backends are only tested when multi_backend is enabled
backend1 = {{ tempest_volume_backend1_name }}
backend2 = {{ tempest_volume_backend2_name }}
backend_names = [ backend1, backend2 ]
backend_names = {{ tempest_volume_backend_names | join(',') }}
[volume-feature-enabled]