From a2c2b876d7a8a56e3d551473af351ea109f0d4d1 Mon Sep 17 00:00:00 2001 From: Mitch Vaughan Date: Tue, 8 Oct 2024 02:37:22 +0000 Subject: [PATCH 1/3] remove unused files from act dir --- .../wan/autovpn/zbackend-infra/act/Makefile | 16 ------------ .../autovpn/zbackend-infra/act/ansible.cfg | 16 ------------ .../zbackend-infra/act/config_grab.yml | 19 -------------- .../zbackend-infra/act/config_push.yml | 26 ------------------- .../zbackend-infra/act/host_networking.yml | 9 ------- .../zbackend-infra/act/push_license.yml | 23 ---------------- .../wan/autovpn/zbackend-infra/act/test.yml | 20 -------------- 7 files changed, 129 deletions(-) delete mode 100644 tech-library/wan/autovpn/zbackend-infra/act/Makefile delete mode 100644 tech-library/wan/autovpn/zbackend-infra/act/ansible.cfg delete mode 100644 tech-library/wan/autovpn/zbackend-infra/act/config_grab.yml delete mode 100644 tech-library/wan/autovpn/zbackend-infra/act/config_push.yml delete mode 100644 tech-library/wan/autovpn/zbackend-infra/act/host_networking.yml delete mode 100644 tech-library/wan/autovpn/zbackend-infra/act/push_license.yml delete mode 100644 tech-library/wan/autovpn/zbackend-infra/act/test.yml diff --git a/tech-library/wan/autovpn/zbackend-infra/act/Makefile b/tech-library/wan/autovpn/zbackend-infra/act/Makefile deleted file mode 100644 index e6d09d1..0000000 --- a/tech-library/wan/autovpn/zbackend-infra/act/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -.PHONY: help -help: ## Display help message - @grep -E '^[0-9a-zA-Z_-]+\.*[0-9a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' - -.PHONY: push-configs -push-configs: ## Push configs to lab - ansible-playbook config_push.yml - -.PHONY: grab-configs -grab-configs: ## Grab configs from the lab - ansible-playbook config_grab.yml - -.PHONY: push-license -push-license: ## Push license to CloudEOS nodes - pip3 install paramiko ansible-pylibssh - ansible-playbook push_license.yml -e ansible_connection=network_cli diff --git a/tech-library/wan/autovpn/zbackend-infra/act/ansible.cfg b/tech-library/wan/autovpn/zbackend-infra/act/ansible.cfg deleted file mode 100644 index 5e22ca1..0000000 --- a/tech-library/wan/autovpn/zbackend-infra/act/ansible.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[defaults] -roles_path = ./roles -collections_paths = ../ansible-avd:../ansible-cvp:../ansible_collections:~/.ansible/collections:/usr/share/ansible/collections -jinja2_extensions = jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n -deprecation_warnings = False -forks = 8 -host_key_checking = False - -vars_plugins_enabled = arista.avd.global_vars, host_group_vars - -[persistent_connection] -connect_timeout = 120 -command_timeout = 120 - -[vars_global_vars] -paths = ../global_vars/evpn_vxlan, ../global_vars/avd_defaults, ../global_vars/fabric_defaults diff --git a/tech-library/wan/autovpn/zbackend-infra/act/config_grab.yml b/tech-library/wan/autovpn/zbackend-infra/act/config_grab.yml deleted file mode 100644 index 0c3d858..0000000 --- a/tech-library/wan/autovpn/zbackend-infra/act/config_grab.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- - -- name: Get configs from all switches in topology - connection: httpapi - hosts: all - gather_facts: false - - vars: - ansible_python_interpreter: /usr/bin/python3 - config_dir: "{{ playbook_dir }}/../configs/" - - tasks: - - - name: "Save running config to {{ config_dir }}" - eos_config: - backup: yes - backup_options: - dir_path: "{{ config_dir }}" - filename: "{{ inventory_hostname }}.cfg" diff --git a/tech-library/wan/autovpn/zbackend-infra/act/config_push.yml b/tech-library/wan/autovpn/zbackend-infra/act/config_push.yml deleted file mode 100644 index 8e6da5f..0000000 --- a/tech-library/wan/autovpn/zbackend-infra/act/config_push.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- - -- name: Push switch configs - connection: httpapi - hosts: all - gather_facts: false - - vars: - ansible_python_interpreter: /usr/bin/python3 - config_dir: "{{ playbook_dir }}/../configs/" - - tasks: - - - name: "Push configs to EOS nodes from {{ config_dir }}" - eos_config: - src: "{{ config_dir }}{{ inventory_hostname }}.cfg" - replace: config - save_when: changed - when: 'HOST' not in {{ inventory_hostname }} - - - name: "Configure end hosts" - eos_config: - src: "{{ config_dir }}{{ inventory_hostname }}.cfg" - replace: config - save_when: changed - when: 'HOST' in {{ inventory_hostname }} \ No newline at end of file diff --git a/tech-library/wan/autovpn/zbackend-infra/act/host_networking.yml b/tech-library/wan/autovpn/zbackend-infra/act/host_networking.yml deleted file mode 100644 index ecb284c..0000000 --- a/tech-library/wan/autovpn/zbackend-infra/act/host_networking.yml +++ /dev/null @@ -1,9 +0,0 @@ -hostnets: - HOSTA1: - int: et1 - ip: 10.10.10.101 - gw: 10.10.10.1 - HOSTA2: - int: et1 - ip: 10.20.20.101 - gw: 10.20.20.1 diff --git a/tech-library/wan/autovpn/zbackend-infra/act/push_license.yml b/tech-library/wan/autovpn/zbackend-infra/act/push_license.yml deleted file mode 100644 index 3bd5464..0000000 --- a/tech-library/wan/autovpn/zbackend-infra/act/push_license.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- name: Copy license file - hosts: routers - gather_facts: false - become: yes - become_method: enable - vars: - ansible_python_interpreter: /usr/bin/python3 - - tasks: - - - name: Copy license file to {{ inventory_hostname }} - ansible.netcommon.net_put: - src: ./ipsec-license.json - protocol: sftp - dest: /mnt/flash/ipsec-license.json - - - name: Install license - eos_command: - commands: - - "license import flash:ipsec-license.json" - - "license update" \ No newline at end of file diff --git a/tech-library/wan/autovpn/zbackend-infra/act/test.yml b/tech-library/wan/autovpn/zbackend-infra/act/test.yml deleted file mode 100644 index 72df3b1..0000000 --- a/tech-library/wan/autovpn/zbackend-infra/act/test.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- - -- name: Push switch configs - hosts: all - gather_facts: false - - vars: - ansible_python_interpreter: /usr/bin/python3 - config_dir: "{{ playbook_dir }}/../configs/" - vars_files: - - "./host_networking.yml" - tasks: - - - name: "Configure et1 ip address" - ansible.builtin.shell: | - ip addr add {{ hostnets[inventory_hostname].ip }} dev {{ hostnets[inventory_hostname].int }} - ip route add 10.40.40.0/24 via {{ hostnets[inventory_hostname].gw }} - register: test - become: yes - when: "{{ 'HOST' in inventory_hostname }}" \ No newline at end of file From c8f9d999ab1079e760e9b5b3f110d5b697128425 Mon Sep 17 00:00:00 2001 From: Mitch Vaughan Date: Tue, 8 Oct 2024 02:37:42 +0000 Subject: [PATCH 2/3] move configs dir for act topo --- .../wan/autovpn/zbackend-infra/{ => act}/configs/DC1-BORDER1.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/DC1-BORDER2.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/DC1-LEAF.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/DC1-R1.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/DC1-R2.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/DC1-SPINE.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/DC2-BORDER1.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/DC2-BORDER2.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/DC2-LEAF.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/DC2-R1.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/DC2-R2.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/DC2-SPINE.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/DCI-MPLS.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/INTERNET.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/S1-R1.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/S1-R2.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/S1-SW1.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/S2-R1.cfg | 0 .../wan/autovpn/zbackend-infra/{ => act}/configs/S2-SW1.cfg | 0 19 files changed, 0 insertions(+), 0 deletions(-) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/DC1-BORDER1.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/DC1-BORDER2.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/DC1-LEAF.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/DC1-R1.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/DC1-R2.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/DC1-SPINE.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/DC2-BORDER1.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/DC2-BORDER2.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/DC2-LEAF.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/DC2-R1.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/DC2-R2.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/DC2-SPINE.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/DCI-MPLS.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/INTERNET.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/S1-R1.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/S1-R2.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/S1-SW1.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/S2-R1.cfg (100%) rename tech-library/wan/autovpn/zbackend-infra/{ => act}/configs/S2-SW1.cfg (100%) diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/DC1-BORDER1.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/DC1-BORDER1.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/DC1-BORDER1.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/DC1-BORDER1.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/DC1-BORDER2.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/DC1-BORDER2.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/DC1-BORDER2.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/DC1-BORDER2.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/DC1-LEAF.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/DC1-LEAF.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/DC1-LEAF.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/DC1-LEAF.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/DC1-R1.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/DC1-R1.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/DC1-R1.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/DC1-R1.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/DC1-R2.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/DC1-R2.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/DC1-R2.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/DC1-R2.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/DC1-SPINE.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/DC1-SPINE.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/DC1-SPINE.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/DC1-SPINE.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/DC2-BORDER1.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/DC2-BORDER1.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/DC2-BORDER1.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/DC2-BORDER1.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/DC2-BORDER2.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/DC2-BORDER2.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/DC2-BORDER2.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/DC2-BORDER2.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/DC2-LEAF.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/DC2-LEAF.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/DC2-LEAF.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/DC2-LEAF.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/DC2-R1.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/DC2-R1.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/DC2-R1.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/DC2-R1.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/DC2-R2.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/DC2-R2.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/DC2-R2.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/DC2-R2.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/DC2-SPINE.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/DC2-SPINE.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/DC2-SPINE.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/DC2-SPINE.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/DCI-MPLS.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/DCI-MPLS.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/DCI-MPLS.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/DCI-MPLS.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/INTERNET.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/INTERNET.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/INTERNET.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/INTERNET.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/S1-R1.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/S1-R1.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/S1-R1.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/S1-R1.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/S1-R2.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/S1-R2.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/S1-R2.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/S1-R2.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/S1-SW1.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/S1-SW1.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/S1-SW1.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/S1-SW1.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/S2-R1.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/S2-R1.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/S2-R1.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/S2-R1.cfg diff --git a/tech-library/wan/autovpn/zbackend-infra/configs/S2-SW1.cfg b/tech-library/wan/autovpn/zbackend-infra/act/configs/S2-SW1.cfg similarity index 100% rename from tech-library/wan/autovpn/zbackend-infra/configs/S2-SW1.cfg rename to tech-library/wan/autovpn/zbackend-infra/act/configs/S2-SW1.cfg From 32158cad6fe4288fc906e737e2e140770f021603 Mon Sep 17 00:00:00 2001 From: Mitch Vaughan Date: Tue, 8 Oct 2024 02:39:03 +0000 Subject: [PATCH 3/3] remove unused ip address from s1-r2 eth1 --- tech-library/wan/autovpn/zbackend-infra/clab/configs/S1-R2.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/tech-library/wan/autovpn/zbackend-infra/clab/configs/S1-R2.cfg b/tech-library/wan/autovpn/zbackend-infra/clab/configs/S1-R2.cfg index 481ba81..ef38ca0 100644 --- a/tech-library/wan/autovpn/zbackend-infra/clab/configs/S1-R2.cfg +++ b/tech-library/wan/autovpn/zbackend-infra/clab/configs/S1-R2.cfg @@ -105,7 +105,6 @@ interface Dps1 ! interface Ethernet1 no switchport - ip address 172.20.3.2/31 ! interface Ethernet1.101 encapsulation dot1q vlan 101