downstream: correctly interpolate defaults

main
Guido Grazioli 2022-09-19 22:41:18 +02:00
parent 52e38f7398
commit ec47a1c5a8
No known key found for this signature in database
GPG Key ID: 22C8C31EF2BC093B
2 changed files with 5 additions and 5 deletions

View File

@ -269,11 +269,11 @@ argument_specs:
description: "Red Hat Single Sign-On version" description: "Red Hat Single Sign-On version"
type: "str" type: "str"
sso_rhn_id: sso_rhn_id:
default: "{{ sso_rhn_ids[keycloak_version].id }}" default: "{{ sso_rhn_ids[sso_version].id }}"
description: "Customer Portal product ID for Red Hat SSO" description: "Customer Portal product ID for Red Hat SSO"
type: "str" type: "str"
sso_archive: sso_archive:
default: "rh-sso-{{ keycloak_version }}-server-dist.zip" default: "rh-sso-{{ sso_version }}-server-dist.zip"
description: "Red Hat SSO install archive filename" description: "Red Hat SSO install archive filename"
type: "str" type: "str"
sso_dest: sso_dest:
@ -281,7 +281,7 @@ argument_specs:
description: "Root installation directory" description: "Root installation directory"
type: "str" type: "str"
sso_installdir: sso_installdir:
default: "{{ keycloak_dest }}/rh-sso-{{ keycloak_version | regex_replace('^([0-9])\\.([0-9]*).*', '\\1.\\2') }}" default: "{{ sso_dest }}/rh-sso-{{ sso_version.split('.')[0] }}.{{ sso_version.split('.')[1] }}"
description: "Installation path for Red Hat SSO" description: "Installation path for Red Hat SSO"
type: "str" type: "str"
sso_rhn_url: sso_rhn_url:
@ -313,6 +313,6 @@ argument_specs:
description: "systemd description for Red Hat Single Sign-On" description: "systemd description for Red Hat Single Sign-On"
type: "str" type: "str"
sso_patch_bundle: sso_patch_bundle:
default: "rh-sso-{{ sso_rhn_ids[keycloak_version].latest_cp.v }}-patch.zip" default: "rh-sso-{{ sso_rhn_ids[sso_version].latest_cp.v }}-patch.zip"
description: "Red Hat SSO patch archive filename" description: "Red Hat SSO patch archive filename"
type: "str" type: "str"

View File

@ -102,7 +102,7 @@ argument_specs:
description: "Root installation directory" description: "Root installation directory"
type: "str" type: "str"
sso_installdir: sso_installdir:
default: "{{ keycloak_dest }}/rh-sso-{{ keycloak_version | regex_replace('^([0-9])\\.([0-9]*).*', '\\1.\\2') }}" default: "{{ sso_dest }}/rh-sso-{{ sso_version.split('.')[0] }}.{{ sso_version.split('.')[1] }}"
description: "Installation path for Red Hat SSO" description: "Installation path for Red Hat SSO"
type: "str" type: "str"
sso_apply_patches: sso_apply_patches: