Merge branch 'fix/ansible-connection-private-config' into 'develop'

Fix/ansible connection private config

See merge request !189

geant/gap_ansible/roles/base_config/tasks/compile_base_config.yaml

@@ -35,6 +35,6 @@
 - name: Set back ansible_host to target terminal server
   ansible.builtin.set_fact:
     ansible_host: "{{ wfo_router.router.router_site.site_ts_address }}"
-    ansible_connection: netconf
+    ansible_connection: "{{ netconf_access[wfo_router.router.vendor].ansible_connection }}"
   when:
     ( wfo_router.router.router_access_via_ts | ansible.builtin.bool ) is true

geant/gap_ansible/roles/base_config/tasks/main.yml

@@ -6,31 +6,29 @@
       - "Allowed verbs: 'compile' and 'deploy'. Use: -e 'verb=$verb'."
   when: (verb is not defined) or (verb not in verbs)
 
+- name: Fail if arguments are missing
+  ansible.legacy.meta: end_play
+  when: (verb is not defined) or (verb not in verbs)
+
+- name: Import routers variables
+  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 ansible_host to terminal server when router is offline
-  ansible.legacy.set_fact:
+  ansible.builtin.set_fact:
     ansible_host: "{{ wfo_router.router.router_site.site_ts_address }}"
     ansible_port: "{{ wfo_router.router.router_ts_port }}"
   when:
     ( wfo_router.router.router_access_via_ts | ansible.builtin.bool ) is true
 
-# FIX: Load these vars via group_vars
 - name: Set variable to connect to nokia
-  ansible.legacy.set_fact:
-    ansible_network_os: geant.gap_ansible.sros
-    ansible_connection: netconf
-  when:
-    wfo_router.router.vendor == "nokia"
-
-- name: Set variables for connecting to Junos
-  ansible.legacy.set_fact:
-    ansible_network_os: junos
-    ansible_connection: netconf
-  when:
-    wfo_router.router.vendor == "juniper"
-
-- name: Fail if arguments are missing
-  ansible.legacy.meta: end_play
-  when: (verb is not defined) or (verb not in verbs)
+  ansible.builtin.set_fact:
+    ansible_connection: "{{ netconf_access[wfo_router.router.vendor].ansible_connection }}"
+    ansible_network_os: "{{ netconf_access[wfo_router.router.vendor].ansible_network_os }}"
 
 # FIX: this does not work with ncclient 0.6.15
 # NOTE: `gather_subset: all` breaks. Workaround to use `min`.
@@ -41,16 +39,9 @@
   when:
     wfo_router.router.vendor == "juniper"
 
-- name: Import routers variables
-  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:
+  ansible.builtin.set_fact:
     opid: "{{ lookup('community.general.random_string', length=18, special=false) }}"
     config_is_different: "False"
 

geant/gap_ansible/roles/base_config_checks/tasks/main.yml

@@ -6,19 +6,14 @@
   when:
     ( wfo_router.router.router_access_via_ts | ansible.builtin.bool ) is true
 
-- name: Set variable to connect to nokia
-  ansible.legacy.set_fact:
-    ansible_network_os: nokia.sros.md
-    ansible_connection: netconf
-  when:
-    wfo_router.router.vendor == "nokia"
+- name: Import variables from 'all'
+  ansible.builtin.include_vars:
+    dir: /opt/ansible_inventory/group_vars/all
 
-- name: Set variables for connecting to Junos
-  ansible.legacy.set_fact:
-    ansible_network_os: junos
-    ansible_connection: netconf
-  when:
-    wfo_router.router.vendor == "juniper"
+- name: Set variable to connect to nokia
+  ansible.builtin.set_fact:
+    ansible_connection: "{{ netconf_access[wfo_router.router.vendor].ansible_connection }}"
+    ansible_network_os: "{{ netconf_access[wfo_router.router.vendor].ansible_network_os }}"
 
 - name: Execute post-check command [NOKIA]
   when:

geant/gap_ansible/roles/ibgp_update/tasks/check_nokia_ibgp.yaml

 - name: Set variable to connect to nokia
   ansible.legacy.set_fact:
-    ansible_network_os: nokia.sros.md
-    ansible_connection: netconf
+    ansible_connection: "{{ netconf_access[wfo_router.router.vendor].ansible_connection }}"
+    ansible_network_os: "{{ netconf_access[wfo_router.router.vendor].ansible_network_os }}"
 
 - name: Check BGP status
   block:

geant/gap_ansible/roles/ibgp_update/tasks/compile.yaml

@@ -26,7 +26,7 @@
 - name: Set back ansible_host to target terminal server
   ansible.builtin.set_fact:
     ansible_host: "{{ wfo_router.router.router_site.site_ts_address }}"
-    ansible_connection: netconf
+    ansible_connection: "{{ netconf_access[wfo_router.router.vendor].ansible_connection }}"
   when:
     wfo_router.router.router_access_via_ts is defined and
     ( wfo_router.router.router_access_via_ts | ansible.builtin.bool ) is true

geant/gap_ansible/roles/ibgp_update/tasks/modify_router_list.yaml

@@ -3,18 +3,9 @@
 # PEs can be either Juniper or Nokia
 
 - name: Adjust network connection according to the vendor
-  block:
-    - name: Set variable to connect to nokia
-      ansible.legacy.set_fact:
-        ansible_network_os: geant.gap_ansible.sros
-        ansible_connection: netconf
-      when: vendor == "nokia"
-
-    - name: Set variables for connecting to Junos
-      ansible.legacy.set_fact:
-        ansible_network_os: junos
-        ansible_connection: netconf
-      when: vendor == "juniper"
+  ansible.builtin.set_fact:
+    ansible_connection: "{{ netconf_access[wfo_router.router.vendor].ansible_connection }}"
+    ansible_network_os: "{{ netconf_access[wfo_router.router.vendor].ansible_network_os }}"
 
 - name: Include compile tasks
   ansible.builtin.include_tasks: compile.yaml

geant/gap_ansible/roles/ibgp_update/tasks/modify_subscription_router.yaml

@@ -2,12 +2,11 @@
 # We need to add all the existing PE the new P
 # P routers will always be NOKIA
 # In this case you have wfo_router as external variable
-# FIX: Load ansible_network_os via group_vars
 #
 - name: Set variable to connect to nokia
   ansible.builtin.set_fact:
-    ansible_network_os: geant.gap_ansible.sros
-    ansible_connection: netconf
+    ansible_connection: "{{ netconf_access[subscription.router.vendor].ansible_connection }}"
+    ansible_network_os: "{{ netconf_access[subscription.router.vendor].ansible_network_os }}"
 
 - name: Set ansible_host to terminal server when router is offline
   ansible.builtin.set_fact:

geant/gap_ansible/roles/promote_p_to_pe/tasks/check_routing_instances.yaml

 - name: Set variable to connect to nokia
   ansible.builtin.set_fact:
-    ansible_network_os: nokia.sros.md
-    ansible_connection: netconf
+    ansible_connection: "{{ netconf_access[subscription.router.vendor].ansible_connection }}"
+    ansible_network_os: "{{ netconf_access[subscription.router.vendor].ansible_network_os }}"
 
 - name: Check VPRN BGP summary
   block:

geant/gap_ansible/roles/promote_p_to_pe/tasks/compile.yaml

@@ -59,4 +59,4 @@
     subscription.router.router_access_via_ts | ansible.builtin.bool
   ansible.builtin.set_fact:
     ansible_host: "{{ subscription.router.router_site.site_ts_address }}"
-    ansible_connection: netconf
+    ansible_connection: "{{ netconf_access[subscription.router.vendor].ansible_connection }}"