Skip to content
Snippets Groups Projects
Commit a64fea76 authored by Aleksandr Kurbatov's avatar Aleksandr Kurbatov
Browse files

Merge branch 'ibgp_update' into 'develop'

router-name

See merge request !94
parents 80831c2a 46e6fd2e
No related branches found
No related tags found
1 merge request!94router-name
Pipeline #85588 passed
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</family> </family>
</group> </group>
<group alu:operation="replace"> <group alu:operation="replace">
<group-name>iGEANT6-P-ONLY</group-name> <group-name>iGEANT-P-ONLY-v6</group-name>
<authentication-key>aX1kndQNDTAHyJttsnoyKQiLcy8euS8do68= hash2</authentication-key> <authentication-key>aX1kndQNDTAHyJttsnoyKQiLcy8euS8do68= hash2</authentication-key>
<next-hop-self>true</next-hop-self> <next-hop-self>true</next-hop-self>
<type>internal</type> <type>internal</type>
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
ansible_port: "{{ subscription.router.router_ts_port }}" ansible_port: "{{ subscription.router.router_ts_port }}"
when: ( subscription.router.router_access_via_ts | ansible.builtin.bool ) is true when: ( subscription.router.router_access_via_ts | ansible.builtin.bool ) is true
- name: Set the vendor variable so I can select the template - name: Set the vendor variable to select correct template
ansible.legacy.set_fact: ansible.legacy.set_fact:
vendor: "{{ subscription.router.router_vendor }}" vendor: "{{ subscription.router.vendor }}"
- name: Include compile tasks - name: Include compile tasks
ansible.builtin.include_tasks: compile.yaml ansible.builtin.include_tasks: compile.yaml
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
when: when:
wfo_router.router.router_access_via_ts is defined and wfo_router.router.router_access_via_ts is defined and
( wfo_router.router.router_access_via_ts | ansible.builtin.bool ) is true ( wfo_router.router.router_access_via_ts | ansible.builtin.bool ) is true
and vendor == 'nokia'
- name: Create a folder for all the things - name: Create a folder for all the things
ansible.builtin.file: ansible.builtin.file:
...@@ -29,3 +30,4 @@ ...@@ -29,3 +30,4 @@
when: when:
wfo_router.router.router_access_via_ts is defined and wfo_router.router.router_access_via_ts is defined and
( wfo_router.router.router_access_via_ts | ansible.builtin.bool ) is true ( wfo_router.router.router_access_via_ts | ansible.builtin.bool ) is true
and vendor == 'nokia'
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
junipernetworks.junos.junos_config: junipernetworks.junos.junos_config:
update: 'replace' update: 'replace'
src: "/var/tmp/ansible_run_{{ opid }}/{{ verb }}.conf" src: "/var/tmp/ansible_run_{{ opid }}/{{ verb }}.conf"
src_format: text src_format: set
check_commit: true check_commit: true
diff: true diff: true
when: > when: >
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
junipernetworks.junos.junos_config: junipernetworks.junos.junos_config:
update: 'replace' update: 'replace'
src: "/var/tmp/ansible_run_{{ opid }}/{{ verb }}.conf" src: "/var/tmp/ansible_run_{{ opid }}/{{ verb }}.conf"
src_format: text src_format: set
comment: "{{ commit_comment }}" comment: "{{ commit_comment }}"
diff: true # diff: true
when: > when: >
( dry_run | ansible.builtin.bool ) is false and ( dry_run | ansible.builtin.bool ) is false and
vendor == "juniper" vendor == "juniper"
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
# geant.gap_ansible.nokia_netconf_config: # geant.gap_ansible.nokia_netconf_config:
format: xml format: xml
default_operation: merge default_operation: merge
content: "{{ lookup('ansible.builtin.template', 'routers/{{ vendor }}/{{ verb }}.j2') }}" content: "{{ lookup('ansible.builtin.template', '{{ vendor }}/{{ verb }}.j2') }}"
commit: true commit: true
validate: true validate: true
# diff: true diff: true
check_mode: true check_mode: true
when: > when: >
( dry_run | ansible.builtin.bool ) is true and ( dry_run | ansible.builtin.bool ) is true and
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
# geant.gap_ansible.nokia_netconf_config: # geant.gap_ansible.nokia_netconf_config:
format: xml format: xml
default_operation: merge default_operation: merge
content: "{{ lookup('ansible.builtin.template', 'routers/{{ vendor }}/{{ verb }}.j2') }}" content: "{{ lookup('ansible.builtin.template', '{{ vendor }}/{{ verb }}.j2') }}"
commit: true commit: true
# commit_comment: "Base-config provisioned using GSO." # commit_comment: "Base-config provisioned using GSO."
# diff: true # diff: true
......
<config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:alu="urn:ietf:params:xml:ns:netconf:base:1.0"> <config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:alu="urn:ietf:params:xml:ns:netconf:base:1.0">
<configure xmlns="urn:nokia.com:sros:ns:yang:sr:conf"> <configure xmlns="urn:nokia.com:sros:ns:yang:sr:conf">
<router> <router>
<router-name>Base</router-name>
<bgp> <bgp>
{% for pe_router in pe_router_list %}
{% for pe_fqdn, pe_ipadd in pe_router.items() %} {% for pe_fqdn, pe_ipadd in pe_router.items() %}
<neighbor 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"> <neighbor 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">
<ip-address>{{ pe_ipadd.lo4 }}</ip-address> <ip-address>{{ pe_ipadd.lo4 }}</ip-address>
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
<group>iGEANT-P-ONLY-v6</group> <group>iGEANT-P-ONLY-v6</group>
</neighbor> </neighbor>
{% endfor %} {% endfor %}
{% endfor %}
</bgp> </bgp>
</router> </router>
</configure> </configure>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment