From ed4ed6aa20793dd13487b42e80e4886d35fdd768 Mon Sep 17 00:00:00 2001 From: Matt Thompson Date: Wed, 9 Sep 2015 16:43:00 +0100 Subject: [PATCH] Allow testing of cinder multi backends w/ tempest This commit adds the following variables to os_tempest role: tempest_volume_backend1_name tempest_volume_backend2_name tempest_volume_multi_backend_enabled This allows you to test that using multiple cinder backends simultaneously works as expected. A deployer may, for example, set tempest_volume_backend1_name to 'lvm' and tempest_volume_backend2_name to 'ceph'. To avoid any surprises, tempest_volume_multi_backend_enabled defaults to 'False', which is the current tempest default value for multi_backend. Closes-Bug: #1493911 Change-Id: I5eeb88d3e90b6ca046be96fb61a1cb6f4e6087ee --- playbooks/roles/os_tempest/defaults/main.yml | 3 +++ playbooks/roles/os_tempest/templates/tempest.conf.j2 | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/playbooks/roles/os_tempest/defaults/main.yml b/playbooks/roles/os_tempest/defaults/main.yml index a7dba0850a..793cda74f8 100644 --- a/playbooks/roles/os_tempest/defaults/main.yml +++ b/playbooks/roles/os_tempest/defaults/main.yml @@ -63,7 +63,10 @@ tempest_swift_discoverable_apis: - slo - tempurl +tempest_volume_backend1_name: backend1 +tempest_volume_backend2_name: backend2 tempest_volume_backup_enabled: False +tempest_volume_multi_backend_enabled: False tempest_main_group: tempest_all diff --git a/playbooks/roles/os_tempest/templates/tempest.conf.j2 b/playbooks/roles/os_tempest/templates/tempest.conf.j2 index c693bb2c37..753cbb13e7 100644 --- a/playbooks/roles/os_tempest/templates/tempest.conf.j2 +++ b/playbooks/roles/os_tempest/templates/tempest.conf.j2 @@ -191,9 +191,12 @@ run_validation = {{ tempest_compute_run_ssh }} [volume] endpoint_type = internalURL -backend1_name = lvm +# NOTE: These backends are only tested when multi_backend is enabled +backend1_name = {{ tempest_volume_backend1_name }} +backend2_name = {{ tempest_volume_backend2_name }} [volume-feature-enabled] backup = {{ tempest_volume_backup_enabled }} snapshot = false +multi_backend = {{ tempest_volume_multi_backend_enabled }}