diff --git a/inventory.yml b/inventory.yml index 862ff322e0efb17b8b1af30afbca6de7c2275df9..54dc8296d0bd1d9f2e83c7de65ce28629ec1f33f 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 4b4251f394112fe5f74506f6bf3a0abdedcb885d..c1c5ce2dd7ebb7830cf40efb148da18844bcd11c 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 cfb8e1820e95eaefd525ea7d55cb7b06a7c97212..5d1dfc2b1be5a3bbd09b73a75653405120960e9d 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 3dce58c27af116b6cb724653851beebac547623b..ee4b330580be70e64a634cad5478288b48583ee7 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 6d6a240451b747837dd1011b23db986b66464cd2..fe9d6a9466e2bb99267129219b923367cdd0fe58 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