diff --git a/geant/gap_ansible/playbooks/iptrunks.yaml b/geant/gap_ansible/playbooks/iptrunks.yaml index 325bacc2932591716db6ecbb161116e8bd1a6cd9..1fc7c566768e8f37b0a21d3f5d2a90ced93f62fe 100644 --- a/geant/gap_ansible/playbooks/iptrunks.yaml +++ b/geant/gap_ansible/playbooks/iptrunks.yaml @@ -1,6 +1,6 @@ - name: Manage iptrunks playbook hosts: all - remote_user: admin + remote_user: "{{ automation_user }}" gather_facts: false roles: - Juniper.junos diff --git a/geant/gap_ansible/roles/iptrunk/templates/juniper/trunk_deprovision.j2 b/geant/gap_ansible/roles/iptrunk/templates/juniper/trunk_deprovision.j2 index 06bc6d4b2b4abbcb9ce362bd2ba2e8ae1ff0b3aa..721c632faeb265e5b08413f242823f5b1656b0e7 100644 --- a/geant/gap_ansible/roles/iptrunk/templates/juniper/trunk_deprovision.j2 +++ b/geant/gap_ansible/roles/iptrunk/templates/juniper/trunk_deprovision.j2 @@ -8,9 +8,9 @@ {% if local is defined %} delete protocols isis interface {{ local.ae_name }} delete interfaces {{ local.ae_name }} - {% for iface in local.members %} -delete interfaces {{ iface }} -delete protocols lldp interface {{ iface }} + {% for member in local.members %} +delete interfaces {{ member.interface_name }} +delete protocols lldp interface {{ member.interface_name }} {% endfor %} {% endif %} {% endfor %} diff --git a/geant/gap_ansible/roles/iptrunk/templates/juniper/trunk_interface.j2 b/geant/gap_ansible/roles/iptrunk/templates/juniper/trunk_interface.j2 index 871efb41ba93aa5bb43897af4c87579697a99fc5..6b4dc11e9aedcb8270ba6927dba2dc1aad3782fb 100644 --- a/geant/gap_ansible/roles/iptrunk/templates/juniper/trunk_interface.j2 +++ b/geant/gap_ansible/roles/iptrunk/templates/juniper/trunk_interface.j2 @@ -16,7 +16,7 @@ {% if local is defined %} {##} - {# I need to sort the source and the destination alfabetically #} + {# I need to sort the source and the destination alfabetically #} {% set trunk_direction_name = [ local.name.split(".")[1] | upper, remote.name.split(".")[1] | upper ] %} {% set trunk_direction_name_sorted = trunk_direction_name|sort %} {##} @@ -49,7 +49,7 @@ } mtu 9000; filter { - input bone-in; + input bone-in; output bone-out; } address {{local.ipv4_address}}; @@ -67,10 +67,10 @@ maximum-labels 5; } } - } + } {% for member in local.members %} - replace: {{member}} { - description "PHY INFRASTRUCTURE BACKBONE P_{{local.ae_name}} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{local.members_descriptions[loop.index0]}}"; + replace: {{ member.interface_name }} { + description "PHY INFRASTRUCTURE BACKBONE P_{{local.ae_name}} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{ member.interface_description }}"; gigether-options { 802.3ad {{local.ae_name}}; } @@ -82,7 +82,7 @@ {% for member in local.members %} replace: interface {{member}} ; {% endfor %} - + } } {% endif %} diff --git a/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_deprovision.j2 b/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_deprovision.j2 index 76565e695dafd83ea39a1120b75dbfa005eb576f..0ceb11225ff8f5e0ac67cb51773ee1f8fe31b9d9 100644 --- a/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_deprovision.j2 +++ b/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_deprovision.j2 @@ -23,9 +23,9 @@ {% for member in local.members %} <port xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes" alu:operation="delete"> - <port-id>{{ member }}</port-id> + <port-id>{{ member.interface_name }}</port-id> <admin-state>enable</admin-state> - <description>PHY INFRASTRUCTURE BACKBONE P_{{local.ae_name}} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{local.members_descriptions[loop.index0]}}</description> + <description>PHY INFRASTRUCTURE BACKBONE P_{{local.ae_name}} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{ member.interface_description }}</description> <ethernet> <mode>network</mode> <mtu>9212</mtu> @@ -55,7 +55,7 @@ </lacp> {% for member in local.members %} <port> - <port-id>{{member}}</port-id> + <port-id>{{ member.interface_name }}</port-id> </port> {% endfor %} </lag> diff --git a/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2 b/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2 index 646bca6f0817fe432be99e1aa146832fa17e4d88..1736f78340fbded6a30eff99ca99100314748169 100644 --- a/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2 +++ b/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2 @@ -23,9 +23,9 @@ {% for member in local.members %} <port xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes" alu:operation="replace"> - <port-id>{{ member }}</port-id> + <port-id>{{ member.interface_name }}</port-id> <admin-state>enable</admin-state> - <description>PHY INFRASTRUCTURE BACKBONE P_{{local.ae_name}} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{local.members_descriptions[loop.index0]}}</description> + <description>PHY INFRASTRUCTURE BACKBONE P_{{ local.ae_name }} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }} | {{ member.interface_description }}</description> <ethernet> <mode>network</mode> <mtu>9212</mtu> @@ -45,17 +45,17 @@ </port> {% endfor %} <lag xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes" alu:operation="replace"> - <lag-name>{{local.ae_name}}</lag-name> + <lag-name>{{ local.ae_name }}</lag-name> <admin-state>enable</admin-state> <description>LAG INFRASTRUCTURE BACKBONE ${{ local.port_sid }} | {{ trunk_direction_name_sorted[0] }}-{{ trunk_direction_name_sorted[1] }}</description> <mode>network</mode> <lacp> <mode>active</mode> - <administrative-key>{{(local.ae_name|split("-"))[1]}}</administrative-key> + <administrative-key>{{ (local.ae_name|split("-"))[1] }}</administrative-key> </lacp> {% for member in local.members %} <port> - <port-id>{{member}}</port-id> + <port-id>{{ member.interface_description }}</port-id> </port> {% endfor %} </lag> diff --git a/geant/gap_ansible/roles/iptrunk/vars/main.yml b/geant/gap_ansible/roles/iptrunk/vars/main.yml index 85c139878e37409e2d4a3c46fe5619595438005a..8160e43763eb4be6eb3bdf41ef7a80a924cf0246 100644 --- a/geant/gap_ansible/roles/iptrunk/vars/main.yml +++ b/geant/gap_ansible/roles/iptrunk/vars/main.yml @@ -45,7 +45,6 @@ trunks: ipv4_address: "{{ side_a_ipv4_address }}" ipv6_address: "{{ side_a_ipv6_address }}" members: "{{ wfo_trunk.iptrunk.iptrunk_sides[0].iptrunk_side_ae_members }}" - members_descriptions: "{{ wfo_trunk.iptrunk.iptrunk_sides[0].iptrunk_side_ae_members_description }}" port_sid: "{{ wfo_trunk.iptrunk.iptrunk_sides[0].iptrunk_side_ae_geant_a_sid }}" nodeB: name: "{{ wfo_trunk.iptrunk.iptrunk_sides[1].iptrunk_side_node.router_fqdn }}" @@ -55,5 +54,4 @@ trunks: ipv4_address: "{{ side_b_ipv4_address }}" ipv6_address: "{{ side_b_ipv6_address }}" members: "{{ wfo_trunk.iptrunk.iptrunk_sides[1].iptrunk_side_ae_members }}" - members_descriptions: "{{ wfo_trunk.iptrunk.iptrunk_sides[1].iptrunk_side_ae_members_description }}" port_sid: "{{ wfo_trunk.iptrunk.iptrunk_sides[1].iptrunk_side_ae_geant_a_sid }}"