From 726fe69ae72827ca1f67345a5968f48d9e780e43 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Thu, 10 Nov 2022 15:05:32 +0100
Subject: [PATCH] vr-vmx image
---
inventory.yml | 5 +++--
roles/containerlab/tasks/import_image.yml | 3 +--
roles/containerlab/tasks/main.yml | 4 ++--
roles/containerlab/vars/main.yml | 5 ++++-
roles/dev_network/tasks/main.yml | 12 ++++++++++++
5 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/inventory.yml b/inventory.yml
index 862ff32..54dc829 100644
--- a/inventory.yml
+++ b/inventory.yml
@@ -1,4 +1,5 @@
dev_environments:
hosts:
- vm01:
- ansible_host: ubclt1
+ test02:
+ ansible_host: containerlab-test02
+
\ No newline at end of file
diff --git a/roles/containerlab/tasks/import_image.yml b/roles/containerlab/tasks/import_image.yml
index 4b4251f..c1c5ce2 100644
--- a/roles/containerlab/tasks/import_image.yml
+++ b/roles/containerlab/tasks/import_image.yml
@@ -5,7 +5,7 @@
register: image_exists
- name: Stop if image exists
- meta: end_play
+ ansible.builtin.meta: end_play
when: image_exists.images | length > 0
- name: Get VM images
@@ -41,4 +41,3 @@
ansible.builtin.file:
path: "/tmp/{{ image.filename }}"
state: absent
-
diff --git a/roles/containerlab/tasks/main.yml b/roles/containerlab/tasks/main.yml
index cfb8e18..5d1dfc2 100644
--- a/roles/containerlab/tasks/main.yml
+++ b/roles/containerlab/tasks/main.yml
@@ -18,10 +18,10 @@
name: boto3
- name: Add relevant users to docker group
- user:
+ ansible.builtin.user:
name: "{{ item }}"
groups: docker
- append: yes
+ append: true
with_items: "{{ users }}"
- name: Create images
diff --git a/roles/containerlab/vars/main.yml b/roles/containerlab/vars/main.yml
index 3dce58c..ee4b330 100644
--- a/roles/containerlab/vars/main.yml
+++ b/roles/containerlab/vars/main.yml
@@ -5,9 +5,12 @@ s3:
bucket: geant-emulation-images
images:
+ - filename: vrnetlab-vr-vmx-18.2R1.9.tar
+ image_name: vrnetlab/vr-vmx
+ image_tag: 18.2R1.9
- filename: cEOS-lab-4.28.2.1F.tar
image_name: ceos
image_tag: 4.28.1.1F
users:
- - erik
+ - nat
diff --git a/roles/dev_network/tasks/main.yml b/roles/dev_network/tasks/main.yml
index 6d6a240..fe9d6a9 100644
--- a/roles/dev_network/tasks/main.yml
+++ b/roles/dev_network/tasks/main.yml
@@ -7,5 +7,17 @@
- name: Create topology file
ansible.builtin.template:
src: ceosx2.clab.yml.j2
+ mode: '0644'
dest: ceosx2/ceosx2.clab.yml
+- name: Working directory
+ ansible.builtin.file:
+ path: vr-vmx
+ state: directory
+ mode: '0755'
+
+- name: Create topology file
+ ansible.builtin.template:
+ src: vr-vmx.clab.yml.j2
+ mode: '0644'
+ dest: vr-vmx/vr-vmx.clab.yml
--
GitLab