From d77ef6c712b8b6e8166bf084e01abd50d97bd89d Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 14 Aug 2019 14:39:00 +0200 Subject: [PATCH] copr: backend: configurable aarch64 builder image --- inventory/group_vars/copr_back | 1 + inventory/group_vars/copr_back_dev | 1 + roles/copr/backend/tasks/resalloc.yml | 6 ++++++ .../resalloc}/vm-aarch64-new | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) rename roles/copr/backend/{files/resalloc_provision => templates/resalloc}/vm-aarch64-new (99%) diff --git a/inventory/group_vars/copr_back b/inventory/group_vars/copr_back index 7d091392ff..0a967dd450 100644 --- a/inventory/group_vars/copr_back +++ b/inventory/group_vars/copr_back @@ -15,6 +15,7 @@ copr_builder_security_groups: "ssh-anywhere-copr,default,ssh-from-persistent-cop copr_builder_images: x86_64: copr-builder-x86_64-f30 ppc64le: copr-builder-ppc64le-f30 + aarch64: copr-builder nrpe_procs_warn: 2200 nrpe_procs_crit: 2500 diff --git a/inventory/group_vars/copr_back_dev b/inventory/group_vars/copr_back_dev index 9fee0a8c5c..bf53e84cc4 100644 --- a/inventory/group_vars/copr_back_dev +++ b/inventory/group_vars/copr_back_dev @@ -15,6 +15,7 @@ copr_builder_security_groups: "ssh-anywhere-coprdev,default,ssh-from-persistent- copr_builder_images: x86_64: copr-builder-x86_64-f30-20190813_185408 ppc64le: copr-builder-ppc64le-f30-20190814_085158 + aarch64: copr-builder fedmsg_enabled: "true" diff --git a/roles/copr/backend/tasks/resalloc.yml b/roles/copr/backend/tasks/resalloc.yml index d66884d5a1..ee8dab18c9 100644 --- a/roles/copr/backend/tasks/resalloc.yml +++ b/roles/copr/backend/tasks/resalloc.yml @@ -41,6 +41,12 @@ tags: - provision_config +- name: resalloc, spawner script + template: src="resalloc/vm-aarch64-new" dest="/var/lib/resallocserver/resalloc_provision/" + mode=755 + tags: + - provision_config + - name: resalloc, generate vars files template: src: "provision/{{ item }}" diff --git a/roles/copr/backend/files/resalloc_provision/vm-aarch64-new b/roles/copr/backend/templates/resalloc/vm-aarch64-new similarity index 99% rename from roles/copr/backend/files/resalloc_provision/vm-aarch64-new rename to roles/copr/backend/templates/resalloc/vm-aarch64-new index ebeeb546e1..69ea141ff5 100755 --- a/roles/copr/backend/files/resalloc_provision/vm-aarch64-new +++ b/roles/copr/backend/templates/resalloc/vm-aarch64-new @@ -15,7 +15,7 @@ import argparse # configuration disk_pool = 'default' -img_volume = 'copr-builder' +img_volume = '{{ copr_builder_images.ppc64le }}' def get_parser():