From 81e2c81b05089430326fa14616f533b25c5e8004 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 20 Sep 2022 14:59:44 +0200 Subject: [PATCH] copr-be: provide OSUOSL credentials for the resalloc-openstack-list script --- roles/copr/backend/tasks/resalloc.yml | 1 + roles/copr/backend/templates/resalloc/osuosl-list.j2 | 4 ++++ roles/copr/backend/templates/resalloc/pools.yaml | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100755 roles/copr/backend/templates/resalloc/osuosl-list.j2 diff --git a/roles/copr/backend/tasks/resalloc.yml b/roles/copr/backend/tasks/resalloc.yml index a880d6c9e7..5ba0cff8a7 100644 --- a/roles/copr/backend/tasks/resalloc.yml +++ b/roles/copr/backend/tasks/resalloc.yml @@ -92,6 +92,7 @@ - ibm-cloud-list-vms - ibm-cloud-list-deleting-vms - osuosl-vm + - osuosl-list tags: - provision_config diff --git a/roles/copr/backend/templates/resalloc/osuosl-list.j2 b/roles/copr/backend/templates/resalloc/osuosl-list.j2 new file mode 100755 index 0000000000..94cdb56cad --- /dev/null +++ b/roles/copr/backend/templates/resalloc/osuosl-list.j2 @@ -0,0 +1,4 @@ +#! /bin/sh + +. "{{ provision_directory }}/.rc-osuosl.sh" +exec resalloc-openstack-list diff --git a/roles/copr/backend/templates/resalloc/pools.yaml b/roles/copr/backend/templates/resalloc/pools.yaml index d4b94b006c..d5e2172543 100644 --- a/roles/copr/backend/templates/resalloc/pools.yaml +++ b/roles/copr/backend/templates/resalloc/pools.yaml @@ -212,7 +212,7 @@ copr_osuosl_p09_{% if devel %}dev{% else %}prod{% endif %}: cmd_delete: "/var/lib/resallocserver/resalloc_provision/vm-delete" cmd_livecheck: "resalloc-check-vm-ip" cmd_release: "/var/lib/resallocserver/resalloc_provision/vm-release" - cmd_list: resalloc-openstack-list + cmd_list: '/var/lib/resallocserver/resalloc_provision/osuosl-list' livecheck_period: 180 reuse_opportunity_time: 180 reuse_max_count: 8