From 6266a19bd6835fa8ae9f3fd34e3dc19b85de0964 Mon Sep 17 00:00:00 2001 From: Aleksandr Kurbatov <ak@geant.org> Date: Tue, 14 Jan 2025 19:40:19 +0000 Subject: [PATCH] Update `deploy_service_config` role for LHCONE access --- .../roles/deploy_service_config/tasks/main.yml | 15 ++++++++++++++- .../roles/deploy_service_config/vars/main.yml | 6 +++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/geant/gap_ansible/roles/deploy_service_config/tasks/main.yml b/geant/gap_ansible/roles/deploy_service_config/tasks/main.yml index 0330f464..8b109a0e 100644 --- a/geant/gap_ansible/roles/deploy_service_config/tasks/main.yml +++ b/geant/gap_ansible/roles/deploy_service_config/tasks/main.yml @@ -9,7 +9,20 @@ when: subscription.product.product_type == 'L3CoreService' ansible.builtin.set_fact: router: "{{ ap.sbp.edge_port.node }}" - vendor: "{{ router.vendor }}" + vendor: "{{ ap.sbp.edge_port.node.vendor }}" + +- name: Extract current inventory router from "vrf_router_list" + when: subscription.product.product_type == 'VRF' + ansible.builtin.set_fact: + current_router: "{{ vrf_router_list | community.general.json_query(query) }}" + vars: + query: "[?router.router_fqdn == '{{ inventory_hostname }}'] | [0]" + +- name: Set router and vendor for the use with VRF update + when: subscription.product.product_type == 'VRF' + ansible.builtin.set_fact: + router: "{{ current_router.router }}" + vendor: "{{ current_router.router.vendor }}" - name: Assemble the config from fragments in previous roles ansible.builtin.include_tasks: assemble_config.yml diff --git a/geant/gap_ansible/roles/deploy_service_config/vars/main.yml b/geant/gap_ansible/roles/deploy_service_config/vars/main.yml index 5def5f74..60eb6cd4 100644 --- a/geant/gap_ansible/roles/deploy_service_config/vars/main.yml +++ b/geant/gap_ansible/roles/deploy_service_config/vars/main.yml @@ -2,6 +2,6 @@ # vars file for deploy_service_config dry_run: true is_verification_workflow: false - -router: "{{ ap.sbp.edge_port.node }}" -vendor: "{{ router.vendor }}" +# +# router: "{{ ap.sbp.edge_port.node }}" +# vendor: "{{ router.vendor }}" -- GitLab