Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
GAP Ansible Collection
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GÉANT Orchestration and Automation Team
GAP
GAP Ansible Collection
Commits
79ea50cf
Commit
79ea50cf
authored
11 months ago
by
Aleksandr Kurbatov
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix/twamp_short_sys_name_regex' into 'develop'
Refactor regex string See merge request
!146
parents
7dd9ed44
69d4f9dc
No related branches found
No related tags found
1 merge request
!146
Refactor regex string
Pipeline
#87308
passed
11 months ago
Stage: linting
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml
+2
-2
2 additions, 2 deletions
geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml
geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml
+0
-1
0 additions, 1 deletion
geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml
with
2 additions
and
3 deletions
geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml
+
2
−
2
View file @
79ea50cf
...
@@ -40,8 +40,8 @@
...
@@ -40,8 +40,8 @@
-
name
:
Set short router names for local and remote sides
-
name
:
Set short router names for local and remote sides
ansible.builtin.set_fact
:
ansible.builtin.set_fact
:
local_side_short_name
:
'
{{
local_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(
postfix_to_remove
,
"")
}}'
remote_side_short_name
:
'
{{
remote_side.iptrunk_side_node.router_fqdn
|
replace(
domain_name_regex
,
"")
}}'
-
name
:
Set Local and Remote side IPv4 addresses nodeA
-
name
:
Set Local and Remote side IPv4 addresses nodeA
ansible.builtin.set_fact
:
ansible.builtin.set_fact
:
...
...
This diff is collapsed.
Click to expand it.
geant/gap_ansible/roles/iptrunk_twamp/vars/main.yml
+
0
−
1
View file @
79ea50cf
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
dry_run
:
"
True"
dry_run
:
"
True"
postfix_to_remove
:
"
.dev.geant.private"
nokia_twamp_server
:
nokia_twamp_server
:
max_conn
:
1
max_conn
:
1
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment