From 7f0201f441ebb2d208244268e4af7fefc213af0c Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sat, 8 Jan 2022 14:05:30 +0100 Subject: [PATCH] copr-builders: new s390x IBM Cloud image --- inventory/group_vars/copr_aws | 2 ++ inventory/group_vars/copr_dev_aws | 2 ++ roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/inventory/group_vars/copr_aws b/inventory/group_vars/copr_aws index 91708e9fd0..109a4a8b40 100644 --- a/inventory/group_vars/copr_aws +++ b/inventory/group_vars/copr_aws @@ -50,6 +50,8 @@ copr_builder_images: hypervisor: ppc64le: copr-builder-ppc64le-20211012_120530 x86_64: copr-builder-x86_64-20211012_115536 + ibm_cloud: + s390x: r022-04564e80-0767-4525-8d1b-64fdae754e23 copr_messaging: true datacenter: aws devel: false diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws index 0ebd781762..c67c019fe5 100644 --- a/inventory/group_vars/copr_dev_aws +++ b/inventory/group_vars/copr_dev_aws @@ -49,6 +49,8 @@ copr_builder_images: hypervisor: ppc64le: copr-builder-ppc64le-20211012_120530 x86_64: copr-builder-x86_64-20211012_115536 + ibm_cloud: + s390x: r022-04564e80-0767-4525-8d1b-64fdae754e23 copr_messaging: true datacenter: aws devel: true diff --git a/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 b/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 index 423064226e..339f178ddd 100755 --- a/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 +++ b/roles/copr/backend/templates/resalloc/ibm-cloud-vm.j2 @@ -18,9 +18,9 @@ from ibm_cloud_sdk_core import ApiException DEFAULT_PLAYBOOK = "{{ provision_directory }}/libvirt-provision.yml" DEFAULT_TOKEN_FILE = "/var/lib/resallocserver/.ibm-cloud-token" +DEFAULT_IMAGE = "{{ copr_builder_images.ibmcloud.s390X }}") subnet_id = "02f7-98674f68-aae1-4ea1-a889-5a0b7a07f4b8" -image_id = "r022-ce9f9b97-1d1c-46d0-9699-6a1c7e6b2e45" vpc_id = "r022-8438169e-d881-4bda-b603-d31fdf0f8b3a" security_group_id = "r022-bf49b90e-c00f-4c68-8707-2936b47b286b" my_key_id = "r022-3918e368-8e00-4e23-9119-5e3ce1eb33bd" @@ -164,6 +164,7 @@ def _get_arg_parser(): "create", help="Create an instance in IBM Cloud") parser_create.add_argument("name") parser_create.add_argument("--playbook", default=DEFAULT_PLAYBOOK) + parser_create.add_argument("--image-uuid", default=DEFAULT_IMAGE) parser_delete = subparsers.add_parser( "delete", help="Delete instance by it's name from IBM Cloud") parser_delete.add_argument("name")