From fb02e3bfb02e792d78d887e51bc17bb69f90dcb3 Mon Sep 17 00:00:00 2001
From: Aleksandr Kurbatov <aleksandr.kurbatov@GL1342-AKURBATOV.local>
Date: Mon, 29 Jul 2024 17:33:19 +0100
Subject: [PATCH] Add group_vars/all into roles

This is related to NAT-680 'inventory restructure' - some of data is
moved from `group_vars/routers` to `group_vars/all`. Hence, the need to
load `group_vars/all` folder in almost all roles, except
`base_config_checks`.
---
 geant/gap_ansible/roles/base_config/tasks/main.yml       | 4 ++++
 geant/gap_ansible/roles/ibgp_update/tasks/main.yml       | 4 ++++
 geant/gap_ansible/roles/iptrunk/tasks/main.yml           | 4 ++++
 geant/gap_ansible/roles/iptrunk_checks/tasks/main.yml    | 4 ++++
 geant/gap_ansible/roles/iptrunk_migration/tasks/main.yml | 4 ++++
 geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml     | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/geant/gap_ansible/roles/base_config/tasks/main.yml b/geant/gap_ansible/roles/base_config/tasks/main.yml
index 0f70b1c8..35d3b0e1 100644
--- a/geant/gap_ansible/roles/base_config/tasks/main.yml
+++ b/geant/gap_ansible/roles/base_config/tasks/main.yml
@@ -45,6 +45,10 @@
   ansible.builtin.include_vars:
     dir: /opt/ansible_inventory/group_vars/routers
 
+- name: Import variables from 'all'
+  ansible.builtin.include_vars:
+    dir: /opt/ansible_inventory/group_vars/all
+
 - name: Generate an ID for this run
   ansible.legacy.set_fact:
     opid: "{{ lookup('community.general.random_string', length=18, special=false) }}"
diff --git a/geant/gap_ansible/roles/ibgp_update/tasks/main.yml b/geant/gap_ansible/roles/ibgp_update/tasks/main.yml
index bbe8fb8a..6306f317 100644
--- a/geant/gap_ansible/roles/ibgp_update/tasks/main.yml
+++ b/geant/gap_ansible/roles/ibgp_update/tasks/main.yml
@@ -14,6 +14,10 @@
   ansible.builtin.include_vars:
     dir: /opt/ansible_inventory/group_vars/routers
 
+- name: Import variables from 'all'
+  ansible.builtin.include_vars:
+    dir: /opt/ansible_inventory/group_vars/all
+
 - name: Generate an ID for this run
   ansible.legacy.set_fact:
     opid: "{{ lookup('community.general.random_string', length=18, special=false) }}"
diff --git a/geant/gap_ansible/roles/iptrunk/tasks/main.yml b/geant/gap_ansible/roles/iptrunk/tasks/main.yml
index 788199e9..9969a88d 100644
--- a/geant/gap_ansible/roles/iptrunk/tasks/main.yml
+++ b/geant/gap_ansible/roles/iptrunk/tasks/main.yml
@@ -16,6 +16,10 @@
   ansible.builtin.include_vars:
     dir: /opt/ansible_inventory/group_vars/routers
 
+- name: Import variables from 'all'
+  ansible.builtin.include_vars:
+    dir: /opt/ansible_inventory/group_vars/all
+
 - name: Set an ID for this run
   ansible.builtin.set_fact:
     opid: "{{ lookup('community.general.random_string', length=18, special=false) }}"
diff --git a/geant/gap_ansible/roles/iptrunk_checks/tasks/main.yml b/geant/gap_ansible/roles/iptrunk_checks/tasks/main.yml
index 3a56c87f..af907bd0 100644
--- a/geant/gap_ansible/roles/iptrunk_checks/tasks/main.yml
+++ b/geant/gap_ansible/roles/iptrunk_checks/tasks/main.yml
@@ -10,6 +10,10 @@
   ansible.builtin.meta: end_play
   when: (check is not defined) or (check not in checks)
 
+- name: Import variables from 'all'
+  ansible.builtin.include_vars:
+    dir: /opt/ansible_inventory/group_vars/all
+
 - name: Import routers variables
   ansible.builtin.include_vars:
     dir: /opt/ansible_inventory/group_vars/routers
diff --git a/geant/gap_ansible/roles/iptrunk_migration/tasks/main.yml b/geant/gap_ansible/roles/iptrunk_migration/tasks/main.yml
index 1ca1cd48..92983df4 100644
--- a/geant/gap_ansible/roles/iptrunk_migration/tasks/main.yml
+++ b/geant/gap_ansible/roles/iptrunk_migration/tasks/main.yml
@@ -12,6 +12,10 @@
   ansible.builtin.meta: end_play
   when: ((verb is not defined) or (config_object is not defined)) or (verb not in verbs) or (config_object not in config_objects)
 
+- name: Import variables from 'all'
+  ansible.builtin.include_vars:
+    dir: /opt/ansible_inventory/group_vars/all
+
 - name: Import routers variables
   ansible.builtin.include_vars:
     dir: /opt/ansible_inventory/group_vars/routers
diff --git a/geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml b/geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml
index ad4d8489..70d26f5a 100644
--- a/geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml
+++ b/geant/gap_ansible/roles/iptrunk_twamp/tasks/main.yml
@@ -1,6 +1,10 @@
 ---
 # tasks file for iptrunk_twamp
 
+- name: Import variables from 'all'
+  ansible.builtin.include_vars:
+    dir: /opt/ansible_inventory/group_vars/all
+
 - name: Import routers variables
   ansible.builtin.include_vars:
     dir: /opt/ansible_inventory/group_vars/routers
-- 
GitLab