From 48fe4214c1ec664f58be59eaf810e7d41ed47bce Mon Sep 17 00:00:00 2001
From: Simone Spinelli <simone.spinelli@geant.org>
Date: Tue, 13 Dec 2022 10:10:30 +0100
Subject: [PATCH] Fixed/reworked playbooks, removed dev_networks role -
deploy_gap_repos seems to work fine.
---
deploy_containerlab.yaml | 7 -------
roles/dev_networks/files/lab01/vmx1.cfg | 5 -----
roles/dev_networks/files/lab01/vmx2.cfg | 5 -----
roles/dev_networks/files/lab01/vr-vmx.clab.yml | 16 ----------------
roles/dev_networks/tasks/main.yml | 6 ------
roles/dev_networks/templates/ceosx2.clab.yml.j2 | 14 --------------
.../dev_networks/templates/srlceos01.clab.yml.j2 | 14 --------------
roles/gap_repos/tasks/main.yml | 8 ++++----
roles/kvm/tasks/main.yml | 1 +
9 files changed, 5 insertions(+), 71 deletions(-)
delete mode 100644 roles/dev_networks/files/lab01/vmx1.cfg
delete mode 100644 roles/dev_networks/files/lab01/vmx2.cfg
delete mode 100644 roles/dev_networks/files/lab01/vr-vmx.clab.yml
delete mode 100644 roles/dev_networks/tasks/main.yml
delete mode 100644 roles/dev_networks/templates/ceosx2.clab.yml.j2
delete mode 100644 roles/dev_networks/templates/srlceos01.clab.yml.j2
diff --git a/deploy_containerlab.yaml b/deploy_containerlab.yaml
index bc48952..24a2984 100644
--- a/deploy_containerlab.yaml
+++ b/deploy_containerlab.yaml
@@ -1,11 +1,5 @@
- name: Sanity check
hosts: dev_environments
- tasks:
- - name: Ping them
- ansible.builtin.ping:
- - name: Show something
- ansible.builtin.debug:
- msg: blah blah
- name: System Setup
hosts: dev_environments
@@ -14,7 +8,6 @@
- kvm
- containerlab
- dev_images
-
- name: System Setup
hosts: dev_environments
roles:
diff --git a/roles/dev_networks/files/lab01/vmx1.cfg b/roles/dev_networks/files/lab01/vmx1.cfg
deleted file mode 100644
index b3b28e0..0000000
--- a/roles/dev_networks/files/lab01/vmx1.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-configure
-set interfaces ge-0/0/0 unit 0 family inet address 192.168.1.2/24
-set interfaces ge-0/0/1 unit 1 family inet address 192.168.1.3/24
-set interfaces ge-0/0/2 unit 2 family inet address 192.168.1.4/24
-commit
\ No newline at end of file
diff --git a/roles/dev_networks/files/lab01/vmx2.cfg b/roles/dev_networks/files/lab01/vmx2.cfg
deleted file mode 100644
index 31d7846..0000000
--- a/roles/dev_networks/files/lab01/vmx2.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-configure
-set interfaces ge-0/0/0 unit 0 family inet address 192.168.2.2/24
-set interfaces ge-0/0/1 unit 1 family inet address 192.168.2.3/24
-set interfaces ge-0/0/2 unit 2 family inet address 192.168.2.4/24
-commit
\ No newline at end of file
diff --git a/roles/dev_networks/files/lab01/vr-vmx.clab.yml b/roles/dev_networks/files/lab01/vr-vmx.clab.yml
deleted file mode 100644
index c66c343..0000000
--- a/roles/dev_networks/files/lab01/vr-vmx.clab.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: vr-vmx
-
-topology:
- kinds:
- vr-vmx:
- image: vrnetlab/vr-vmx:18.2R1.9
- nodes:
- vmx1:
- kind: vr-vmx
- startup-config: vmx1.cfg
- vmx2:
- kind: vr-vmx
- startup-config: vmx2.cfg
-
- links:
- - endpoints: ["vmx1:eth1", "vmx2:eth1"]
diff --git a/roles/dev_networks/tasks/main.yml b/roles/dev_networks/tasks/main.yml
deleted file mode 100644
index fa9b732..0000000
--- a/roles/dev_networks/tasks/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- name: Copy lab01 project to remote
- ansible.builtin.copy:
- src: lab01
- dest: $HOME
- directory_mode: '0755'
- mode: '0644'
diff --git a/roles/dev_networks/templates/ceosx2.clab.yml.j2 b/roles/dev_networks/templates/ceosx2.clab.yml.j2
deleted file mode 100644
index caf1bb0..0000000
--- a/roles/dev_networks/templates/ceosx2.clab.yml.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-name: ceosx2
-
-topology:
- nodes:
- ceos1:
- kind: ceos
- image: ceos:4.28.1.1F
- ceos2:
- kind: ceos
- image: ceos:4.28.1.1F
-
- links:
- - endpoints: ["ceos1:eth1", "ceos2:eth1"]
-
diff --git a/roles/dev_networks/templates/srlceos01.clab.yml.j2 b/roles/dev_networks/templates/srlceos01.clab.yml.j2
deleted file mode 100644
index 75f1be0..0000000
--- a/roles/dev_networks/templates/srlceos01.clab.yml.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-name: srlceos01
-
-topology:
- nodes:
- srl:
- kind: srl
- image: ghcr.io/nokia/srlinux
- ceos:
- kind: srl
- image: ghcr.io/nokia/srlinux
-
- links:
- - endpoints: ["srl:e1-1", "ceos:e1-1"]
-
diff --git a/roles/gap_repos/tasks/main.yml b/roles/gap_repos/tasks/main.yml
index 6faed74..629befb 100644
--- a/roles/gap_repos/tasks/main.yml
+++ b/roles/gap_repos/tasks/main.yml
@@ -26,12 +26,12 @@
delegate_to: localhost
become_user: "{{ local_username.stdout }}"
-- name: Copy GAP on the target
+- name: Copy GAP Ansible on the target
ansible.builtin.copy:
src: /var/tmp/gap_ansible
- dest: ~/gap_ansible
+ dest: ~/gap_reference_topolog/gap_ansible
-- name: Copy GAP on the target
+- name: Copy GAP Refernece topoloy on the target
ansible.builtin.copy:
src: /var/tmp/gap_reference_topology
- dest: ~/gap_reference_topology
+ dest: ~/
diff --git a/roles/kvm/tasks/main.yml b/roles/kvm/tasks/main.yml
index 10154f4..da315fb 100644
--- a/roles/kvm/tasks/main.yml
+++ b/roles/kvm/tasks/main.yml
@@ -7,3 +7,4 @@
- virtinst
- libvirt-clients
- bridge-utils
+ update_cache: true
--
GitLab