Merge branch 'cleanup' into 'develop'

Cleanup

See merge request !116

geant/gap_ansible/playbooks/base_config_checks.yaml

@@ -2,7 +2,5 @@
   hosts: all
   connection: netconf
   gather_facts: false
-  # remote_user: "{{ gap_ansible_user }}"
-  remote_user: geant-ne-na-lab
   roles:
     - ../roles/base_config_checks

geant/gap_ansible/playbooks/check_ibgp.yaml

 - name: Check iBGP status on P
   hosts: all
-  # remote_user: "{{ gap_ansible_user }}"
-  remote_user: geant-ne-na-lab
   gather_facts: false
   roles:
     - Juniper.junos

geant/gap_ansible/playbooks/iptrunks_checks.yaml

 - name: Manage iptrunks checks playbook
   hosts: all
-  # remote_user: "{{ gap_ansible_user }}"
-  # remote_user: geant-ne-na-lab
   gather_facts: false
   roles:
     - Juniper.junos

geant/gap_ansible/playbooks/iptrunks_migration.yaml

 - name: Manage iptrunks migration
   hosts: all
-  # remote_user: "{{ gap_ansible_user }}"
-  remote_user: geant-ne-na-lab
   gather_facts: false
   roles:
     - Juniper.junos

geant/gap_ansible/playbooks/update_ibgp_mesh.yaml

 - name: Manage iBGP mesh
   hosts: all
-  # remote_user: "{{ gap_ansible_user }}"
-  remote_user: geant-ne-na-lab
   gather_facts: false
   roles:
     - Juniper.junos

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

@@ -17,20 +17,12 @@
     src: "/var/tmp/ansible_run_{{ opid }}/{{ mytemplates.template_name }}.conf"
     src_format: text
     comment: "{{ commit_comment }}"
-  register: response
+  diff: true
   when: >
     verb == "deploy" and
     ( dry_run | ansible.builtin.bool ) is false and
     wfo_router.router.vendor == "juniper"
 
-# - name: Show diff
-#   ansible.builtin.debug:
-#     msg: "{{ response }}"
-#   when: >
-#     verb == "deploy" and
-#     ( dry_run | ansible.builtin.bool ) is false and
-#     wfo_router.router.vendor == "juniper"
-
 - name: Deploy base_config on "{{ inventory_hostname }}" [CHECK ONLY][NOKIA]
   ansible.netcommon.netconf_config:
   # geant.gap_ansible.nokia_netconf_config:

geant/gap_ansible/roles/base_config_checks/tasks/base_config_checks_juniper.yaml

 - name: Base config Juniper checks
-  juniernetworks.junos.junos_command:
+  junipernetworks.junos.junos_command:
     commands:
       - show version
       - show system alarms

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

@@ -16,7 +16,7 @@
     src: "/var/tmp/ansible_run_{{ opid }}/{{ verb }}.conf"
     src_format: set
     comment: "{{ commit_comment }}"
-  # diff: true
+  diff: true
   when: >
     ( dry_run | ansible.builtin.bool ) is false and
     vendor == "juniper"
@@ -51,7 +51,7 @@
     content: "{{ lookup('ansible.builtin.template', '{{ vendor }}/{{ verb }}.j2') }}"
     commit: true
     # commit_comment: "Base-config provisioned using GSO."
-  # diff: true
+  diff: true
   check_mode: false
   when: >
     ( dry_run | ansible.builtin.bool ) is false and

geant/gap_ansible/roles/iptrunk/tasks/deploy_object.yaml

@@ -17,6 +17,7 @@
     src: "/var/tmp/ansible_run_{{ opid }}/{{ config_object }}.conf"
     src_format: text
     comment: "{{ commit_comment }}"
+  diff: true
   when: >
     verb == "deploy" and
     local_side.iptrunk_side_node.vendor == "juniper" and
@@ -49,7 +50,7 @@
     default_operation: merge
     content: "{{ lookup('ansible.builtin.template', '{{ local_side.iptrunk_side_node.vendor }}/{{ config_object }}.j2') }}"
     commit: true
-  # diff: true
+  diff: true
   check_mode: false
   when: >
     verb == "deploy" and

geant/gap_ansible/roles/iptrunk/tasks/modify_trunk.yaml

@@ -24,4 +24,5 @@
     src: "/var/tmp/ansible_run_{{ opid }}/isis_interface.conf"
     src_format: text
     comment: "{{ commit_comment }}"
+  diff: true
   when: verb == "modify" and not (dry_run | ansible.builtin.bool) and (modify_metric | ansible.builtin.bool)

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

@@ -45,10 +45,16 @@
   ansible.builtin.set_fact:
     ansible_host: "{{ new_node.router.router_site.site_ts_address }}"
     ansible_port: "{{ new_node.router.router_ts_port }}"
+  when:
+    verb == "deploy" and ( new_node.router.router_access_via_ts | ansible.builtin.bool ) is true
+
+# TODO: set ansible_connection / ansible_network_os when not TS
+- name: Set connection and host OS
+  ansible.builtin.set_fact:
     ansible_connection: "{{ netconf_access[new_node.router.vendor].ansible_connection }}"
     ansible_network_os: "{{ netconf_access[new_node.router.vendor].ansible_network_os }}"
   when:
-    verb == "deploy" and ( new_node.router.router_access_via_ts | ansible.builtin.bool ) is true
+    verb == "deploy"
 
 - name: Print the ID
   ansible.builtin.debug: