From 5a5c625b8dc6be1f97d2860309adb37533329c79 Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Thu, 28 Feb 2019 00:13:58 +0530 Subject: [PATCH] Handle ceph_rgws variable being undefined The tempest_service_available_swift variable depends on ceph_rgws being defined which is always the case when os_tempest is used in OSA. This patch allows os_tempest to run correctly when ceph_rgws is undefined, as would bethe case outside OSA. Change-Id: I077fceb7f8e9bee46ef71595a43d7687b8f98508 --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 7a0cc33b..c6e605f5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -196,7 +196,7 @@ tempest_service_available_nova_lxd: False tempest_service_available_octavia: "{{ groups['octavia_all'] is defined and groups['octavia_all'] | length > 0 }}" tempest_service_available_sahara: "{{ groups['sahara_all'] is defined and groups['sahara_all'] | length > 0 }}" -tempest_service_available_swift: "{{ (groups['swift_all'] is defined and groups['swift_all'] | length > 0) or (groups['ceph-rgw'] is defined and groups['ceph-rgw'] | length > 0) or (ceph_rgws | length > 0) }}" +tempest_service_available_swift: "{{ (groups['swift_all'] is defined and groups['swift_all'] | length > 0) or (groups['ceph-rgw'] is defined and groups['ceph-rgw'] | length > 0) or (ceph_rgws is defined and ceph_rgws | length > 0) }}" tempest_service_available_zaqar: "{{ groups['zaqar_all'] is defined and groups['zaqar_all'] | length > 0 }}" tempest_image_api_v1_enabled: False