From 69d4f9dc2c95ea481b3da966f9e3d8450187d58d Mon Sep 17 00:00:00 2001
From: Aleksandr Kurbatov <aleksandr.kurbatov@GL1342.local>
Date: Fri, 21 Jun 2024 09:45:38 +0100
Subject: [PATCH] Refactor regex string
Regex that is used in calculation of short system names.
It is per environment, so the var that is needed for the regex moved to
the group_vars inventory.
E.g. in DEV env it will be ".dev.geant.private", in UAT and PROD -
different.
---
geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml | 4 ++--
geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml b/geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml
index 2138f98d..ad4d8489 100644
--- a/geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml
+++ b/geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml
@@ -40,8 +40,8 @@
- name: Set short router names for local and remote sides
ansible.builtin.set_fact:
- local_side_short_name: '{{ local_side.iptrunk_side_node.router_fqdn | replace(postfix_to_remove, "") }}'
- remote_side_short_name: '{{ remote_side.iptrunk_side_node.router_fqdn | replace(postfix_to_remove, "") }}'
+ local_side_short_name: '{{ local_side.iptrunk_side_node.router_fqdn | replace(domain_name_regex, "") }}'
+ remote_side_short_name: '{{ remote_side.iptrunk_side_node.router_fqdn | replace(domain_name_regex, "") }}'
- name: Set Local and Remote side IPv4 addresses nodeA
ansible.builtin.set_fact:
diff --git a/geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml b/geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml
index 1b39b112..ace9a7ac 100644
--- a/geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml
+++ b/geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml
@@ -5,7 +5,6 @@
dry_run: "True"
-postfix_to_remove: ".dev.geant.private"
nokia_twamp_server:
max_conn: 1
--
GitLab