From 15eb51e8442ad87322004bdf2549830aece78e9c Mon Sep 17 00:00:00 2001
From: Aleksandr Kurbatov <ak@geant.org>
Date: Wed, 23 Oct 2024 18:37:17 +0100
Subject: [PATCH] Split standard tasks into 2
Standard_tasks: contains all the usage and ID calculations
connection_tasks: connection vars manipulation
---
.../roles/edge_port/tasks/connection_tasks.yaml | 11 +++++++++++
geant/gap_ansible/roles/edge_port/tasks/main.yml | 5 ++++-
.../roles/edge_port/tasks/standard_tasks.yaml | 11 -----------
3 files changed, 15 insertions(+), 12 deletions(-)
create mode 100644 geant/gap_ansible/roles/edge_port/tasks/connection_tasks.yaml
diff --git a/geant/gap_ansible/roles/edge_port/tasks/connection_tasks.yaml b/geant/gap_ansible/roles/edge_port/tasks/connection_tasks.yaml
new file mode 100644
index 00000000..56768fbf
--- /dev/null
+++ b/geant/gap_ansible/roles/edge_port/tasks/connection_tasks.yaml
@@ -0,0 +1,11 @@
+---
+- name: Set ansible_host to terminal server when router is offline
+ when: router.router_access_via_ts | ansible.builtin.bool
+ ansible.builtin.set_fact:
+ ansible_host: "{{ router.router_site.site_ts_address }}"
+ ansible_port: "{{ router.router_ts_port }}"
+
+- name: Load netconf connection config
+ ansible.builtin.set_fact:
+ ansible_connection: "{{ netconf_access[router.vendor].ansible_connection }}"
+ ansible_network_os: "{{ netconf_access[router.vendor].ansible_network_os }}"
diff --git a/geant/gap_ansible/roles/edge_port/tasks/main.yml b/geant/gap_ansible/roles/edge_port/tasks/main.yml
index 172cbfa9..4a0d1f4c 100644
--- a/geant/gap_ansible/roles/edge_port/tasks/main.yml
+++ b/geant/gap_ansible/roles/edge_port/tasks/main.yml
@@ -7,6 +7,9 @@
when: verb in verbs
ansible.builtin.include_tasks: compile.yaml
-- name: Include create if selected
+- name: Include set connection tasks
+ ansible.builtin.include_tasks: connection_tasks.yaml
+
+- name: Include deploy tasks
when: verb in verbs
ansible.builtin.include_tasks: deploy.yaml
diff --git a/geant/gap_ansible/roles/edge_port/tasks/standard_tasks.yaml b/geant/gap_ansible/roles/edge_port/tasks/standard_tasks.yaml
index 5a966bca..f0bc6dea 100644
--- a/geant/gap_ansible/roles/edge_port/tasks/standard_tasks.yaml
+++ b/geant/gap_ansible/roles/edge_port/tasks/standard_tasks.yaml
@@ -24,17 +24,6 @@
ansible.builtin.include_vars:
dir: /opt/ansible_inventory/group_vars/all
-- name: Set ansible_host to terminal server when router is offline
- when: router.router_access_via_ts | ansible.builtin.bool
- ansible.builtin.set_fact:
- ansible_host: "{{ router.router_site.site_ts_address }}"
- ansible_port: "{{ router.router_ts_port }}"
-
-- name: Load netconf connection config
- ansible.builtin.set_fact:
- ansible_connection: "{{ netconf_access[router.vendor].ansible_connection }}"
- ansible_network_os: "{{ netconf_access[router.vendor].ansible_network_os }}"
-
- name: Generate an ID for this run
ansible.builtin.set_fact:
opid: "{{ lookup('community.general.random_string', length=18, special=false) }}"
--
GitLab