From 88c881048dc2cd7c6b66b5754b9799c86ae89206 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Wed, 12 Jan 2022 14:14:27 +0100
Subject: [PATCH] copr-builders: ibmcloud token filename on one place

---
 roles/copr/backend/tasks/resalloc.yml                 | 6 ++++--
 roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/roles/copr/backend/tasks/resalloc.yml b/roles/copr/backend/tasks/resalloc.yml
index b18fd5088e..66d43c4ab9 100644
--- a/roles/copr/backend/tasks/resalloc.yml
+++ b/roles/copr/backend/tasks/resalloc.yml
@@ -33,7 +33,9 @@
   become: yes
   become_user: postgres
 
-- set_fact: provision_directory=/var/lib/resallocserver/provision
+- set_fact:
+    provision_directory: /var/lib/resallocserver/provision
+    ibmcloud_token_file: /var/lib/resallocserver/.ibm-cloud-token
   tags:
   - provision_config
 
@@ -149,7 +151,7 @@
 - name: install IBM Cloud token file
   copy:
     content: "IBMCLOUD_API_KEY={{ copr_cloud_ibm_token | default('unset') }}"
-    dest: /var/lib/resallocserver/.ibm-cloud-token
+    dest: "{{ ibmcloud_token_file }}"
     owner: resalloc
     group: resalloc
     mode: 0600
diff --git a/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 b/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2
index 4bff29be8a..0e64bc83ca 100755
--- a/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2
+++ b/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2
@@ -16,7 +16,7 @@ from ibm_vpc import VpcV1
 from ibm_cloud_sdk_core.authenticators import IAMAuthenticator
 
 DEFAULT_PLAYBOOK = "{{ provision_directory }}/libvirt-provision.yml"
-DEFAULT_TOKEN_FILE = "/var/lib/resallocserver/.ibm-cloud-token"
+DEFAULT_TOKEN_FILE = "{{ ibmcloud_token_file }}"
 DEFAULT_IMAGE = "{{ copr_builder_images.ibm_cloud.s390x }}"
 
 SUBNET_ID = "02f7-98674f68-aae1-4ea1-a889-5a0b7a07f4b8"