From 9741976e0ac06b27837bd45aedd5b0952cf412a6 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 9 Oct 2023 10:45:16 +0200 Subject: [PATCH] copr-be: typos in pools.yaml jinja --- roles/copr/backend/templates/resalloc/pools.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/roles/copr/backend/templates/resalloc/pools.yaml b/roles/copr/backend/templates/resalloc/pools.yaml index 7f9e21b30d..b1f12430a9 100644 --- a/roles/copr/backend/templates/resalloc/pools.yaml +++ b/roles/copr/backend/templates/resalloc/pools.yaml @@ -1,6 +1,6 @@ --- -{% macro aws(arch, max, max_starting, max_prealloc, spot=False, on_demand=None) %} -aws_{{ arch }}_{{ on_demand if on_demand else '' }}{% if spot %}spot{% else %}normal{% endif %}_{% if devel %}dev{% else %}prod{% endif %}: +{% macro aws(arch, max, max_starting, max_prealloc, spot=False, on_demand=none) %} +aws_{{ arch }}_{{ on_demand if on_demand is not none else '' }}{% if spot %}spot{% else %}normal{% endif %}_{% if devel %}dev{% else %}prod{% endif %}: {% if not on_demand %} max: {{ max }} max_starting: {{ max_starting }} @@ -32,17 +32,18 @@ aws_{{ arch }}_{{ on_demand if on_demand else '' }}{% if spot %}spot{% else %}no - arch_aarch64_native {% endif %} {% if on_demand %} + on_demand_tags: - on_demand_{{ on_demand }} {% endif %} -{% if arch == 'x86_64' and on_demand is None %} +{% if arch == 'x86_64' and on_demand is none %} {% set itype='i4i.large' %} {% elif arch == 'x86_64' and on_demand == 'powerful' %} {% set itype='r7a.16xlarge' %} -{% elif arhc == 'aarch64' and on_demand is None %} +{% elif arch == 'aarch64' and on_demand is none %} {% set itype='c7g.xlarge' %} -{% elif arhc == 'aarch64' and on_demand is 'powerful' %} +{% elif arch == 'aarch64' and on_demand == 'powerful' %} {% set itype='r7g.16xlarge' %} {% endif %}