From ae26041848213a91faa1c69136d73c58e9da6680 Mon Sep 17 00:00:00 2001 From: Eduardo Olivares Date: Mon, 11 Dec 2023 12:00:34 +0100 Subject: [PATCH] Fix Manila shares cleanup Change-Id: I3c2640db28f1fc6bd40c22d3ed2ce9c1ae6d381b --- roles/tobiko-cleanup/tasks/main.yaml | 5 ++--- roles/tobiko-configure/defaults/main.yaml | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/roles/tobiko-cleanup/tasks/main.yaml b/roles/tobiko-cleanup/tasks/main.yaml index 1a7bab8c0..b19cad08c 100644 --- a/roles/tobiko-cleanup/tasks/main.yaml +++ b/roles/tobiko-cleanup/tasks/main.yaml @@ -41,8 +41,7 @@ - name: "cleanup Manila shares created by Tobiko tests" shell: | - source {{ stackrc_file }} - openstack share list -f value -c 'Name' | \ + {{ openstack_cmd }} share list -f value -c 'Name' | \ grep "^tobiko" | \ - xargs -r openstack share delete --force + xargs -r {{ openstack_cmd }} share delete --force ignore_errors: yes diff --git a/roles/tobiko-configure/defaults/main.yaml b/roles/tobiko-configure/defaults/main.yaml index 9566a7a37..a6b7af78f 100644 --- a/roles/tobiko-configure/defaults/main.yaml +++ b/roles/tobiko-configure/defaults/main.yaml @@ -29,9 +29,6 @@ test_log_debug: '' test_case_timeout: 1800. test_runner_timeout: 14400. -# OpenStack client credentials -stackrc_file: '{{ ansible_user_dir }}/overcloudrc' - undercloud_hostname: '{{ groups.get("undercloud", []) | first | default("undercloud-0") }}' undercloud_ssh_hostname: '' undercloud_ssh_key_filename: ''