From 830605407d322e36bd3fd10395c8c17409d3a97c Mon Sep 17 00:00:00 2001 From: Thomas Schneider <tschneider@asta.rwth-aachen.de> Date: Wed, 2 Dec 2020 16:29:41 +0100 Subject: [PATCH] client: set lpoptions based on ansible_hostname instead inventory_ This breaks in AStA where the inventory hostnames are FQDNs. --- desktop/templates/lpoptions.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/templates/lpoptions.j2 b/desktop/templates/lpoptions.j2 index 9e70a73..26f157c 100644 --- a/desktop/templates/lpoptions.j2 +++ b/desktop/templates/lpoptions.j2 @@ -1,9 +1,9 @@ -{%- if inventory_hostname | regex_replace('[0-9]$', '') == "hoern" or inventory_hostname == "portal" -%} +{%- if ansible_hostname | regex_replace('[0-9]$', '') == "hoern" or ansible_hostname == "portal" -%} Default Hoern_Kopierer Duplex=DuplexNoTumble -{%- elif inventory_hostname | regex_replace('[0-9]$', '') == "lxc" -%} +{%- elif ansible_hostname | regex_replace('[0-9]$', '') == "lxc" -%} Dest Kopierer_Briefpapier ColorModel=Gray KCRotate=On Default Kopierer_BW ColorModel=Gray {%- else -%} -{%- set number = inventory_hostname | regex_replace('^[a-z]*', '') -%} +{%- set number = ansible_hostname | regex_replace('^[a-z]*', '') -%} Default Kopierer ColorModel=Gray Duplex=DuplexNoTumble OutputBin=MBDWN0{{ number }} {%- endif -%} -- GitLab