From c1af467ba0e399eabbf89e1e515e2efdeb0d2cab Mon Sep 17 00:00:00 2001 From: Jiri Kyjovsky Date: Fri, 20 Oct 2023 15:33:47 +0200 Subject: [PATCH] copr-be: use resalloc_pool_id env variable for reaslloc-ibm-cloud-list-vms --- .../templates/resalloc/ibm-cloud-list-deleting-vms.j2 | 11 ----------- .../backend/templates/resalloc/ibm-cloud-list-vms.j2 | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/roles/copr/backend/templates/resalloc/ibm-cloud-list-deleting-vms.j2 b/roles/copr/backend/templates/resalloc/ibm-cloud-list-deleting-vms.j2 index 22d3bf45bb..b3db7541ba 100644 --- a/roles/copr/backend/templates/resalloc/ibm-cloud-list-deleting-vms.j2 +++ b/roles/copr/backend/templates/resalloc/ibm-cloud-list-deleting-vms.j2 @@ -1,16 +1,5 @@ #! /bin/bash -case $RESALLOC_NAME in - *tokyo*) - zone=jp-tok - ;; - *) - echo "Can't decide what location to assign from: $RESALLOC_NAME" - exit 1 - ;; -esac - exec resalloc-ibm-cloud-list-deleting-vms \ --token-file "{{ ibmcloud_token_file }}" \ - --zone "$zone" \ "$@" diff --git a/roles/copr/backend/templates/resalloc/ibm-cloud-list-vms.j2 b/roles/copr/backend/templates/resalloc/ibm-cloud-list-vms.j2 index 92a159377a..24d96e8f49 100644 --- a/roles/copr/backend/templates/resalloc/ibm-cloud-list-vms.j2 +++ b/roles/copr/backend/templates/resalloc/ibm-cloud-list-vms.j2 @@ -1,11 +1,11 @@ #! /bin/bash -case $RESALLOC_NAME in +case $RESALLOC_POOL_ID in *tokyo*) zone=jp-tok ;; *) - echo "Can't decide what location to assign from: $RESALLOC_NAME" + echo "Can't decide what location to assign from: $RESALLOC_POOL_ID" exit 1 ;; esac