From 3b2f08ef5a0acb00c1cce84690aece15e9cea74d Mon Sep 17 00:00:00 2001
From: Simone Spinelli <simone.spinelli@geant.org>
Date: Thu, 29 Aug 2024 11:24:17 +0200
Subject: [PATCH] Fix linting problems
---
.../base_config/tasks/merge_variables.yaml | 24 ++++++++++---------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/geant/gap_ansible/roles/base_config/tasks/merge_variables.yaml b/geant/gap_ansible/roles/base_config/tasks/merge_variables.yaml
index bcc03b89..081e6b64 100644
--- a/geant/gap_ansible/roles/base_config/tasks/merge_variables.yaml
+++ b/geant/gap_ansible/roles/base_config/tasks/merge_variables.yaml
@@ -6,6 +6,7 @@
#
# This playbook should be included in any other playbook that makes use of these variables.
#
+
- name: Merge system login user vars
merge_vars:
suffix_to_merge: users__to_merge
@@ -30,20 +31,21 @@
- name: Select the correct chassis and cards/ports onfig for SR7
ansible.builtin.set_fact:
- nokia_chassis: "{{sr7_chassis.nokia_chassis}}"
- nokia_power_safety_level: "{{sr7_chassis.nokia_power_safety_level}}"
- nokia_sfms: "{{sr7_chassis.nokia_sfms}}"
- nokia_cards: "{{sr7_cards.nokia_cards}}"
- nokia_xma2_connectors: "{{sr7_cards.nokia_xma2_connectors}}"
- when: wfo_router.router.router_site.site_tier = 1 or wfo_router.router.router_site.site_tier = 2
+ nokia_chassis: "{{ sr7_chassis.nokia_chassis }}"
+ nokia_power_safety_level: "{{ sr7_chassis.nokia_power_safety_level }}"
+ nokia_sfms: "{{ sr7_chassis.nokia_sfmsi }}"
+ nokia_cards: "{{ sr7_cards.nokia_cards }}"
+ nokia_xma2_connectors: "{{ sr7_cards.nokia_xma2_connectors }}"
+ when: wfo_router.router.router_site.site_tier = 1 or
+ wfo_router.router.router_site.site_tier = 2
- name: Select the correct chassis and cards/ports config for SR2-se
ansible.builtin.set_fact:
- nokia_chassis: "{{sr2se_chassis.nokia_chassis}}"
- nokia_power_safety_level: "{{sr2se_chassis.nokia_power_safety_level}}"
- nokia_sfms: "{{sr2se_chassis.nokia_sfms}}"
- nokia_cards: "{{sr2se_cards.nokia_cards}}"
- nokia_xma2_connectors: "{{sr2se_cards.nokia_xma2_connectors}}"
+ nokia_chassis: "{{ sr2se_chassis.nokia_chassis }}"
+ nokia_power_safety_level: "{{ sr2se_chassis.nokia_power_safety_level }}"
+ nokia_sfms: "{{ sr2se_chassis.nokia_sfms }}"
+ nokia_cards: "{{ sr2se_cards.nokia_cards }}"
+ nokia_xma2_connectors: "{{ sr2se_cards.nokia_xma2_connectors }}"
when: wfo_router.router.router_site.site_tier = 3
- name: Prepare PE-specific vars
--
GitLab