From f3beda0f1a9903d430b7fdb1eae52e74eb07229c Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Wed, 16 Nov 2022 09:56:49 +0100
Subject: [PATCH] new s3 access key and use group_vars
---
roles/containerlab/tasks/main.yml | 3 +--
roles/containerlab/vars/main.yml | 19 -------------------
roles/dev_images/tasks/main.yml | 10 +++++-----
3 files changed, 6 insertions(+), 26 deletions(-)
delete mode 100644 roles/containerlab/vars/main.yml
diff --git a/roles/containerlab/tasks/main.yml b/roles/containerlab/tasks/main.yml
index 1f93233..4d301b5 100644
--- a/roles/containerlab/tasks/main.yml
+++ b/roles/containerlab/tasks/main.yml
@@ -19,7 +19,6 @@
- name: Add relevant users to docker group
ansible.builtin.user:
- name: "{{ item }}"
+ name: "{{ nat_user }}"
groups: docker
append: true
- with_items: "{{ users }}"
diff --git a/roles/containerlab/vars/main.yml b/roles/containerlab/vars/main.yml
deleted file mode 100644
index 51bd403..0000000
--- a/roles/containerlab/vars/main.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-s3:
- access_key: AKIA6DQFYS5WRMJU4FW6
- secret_key: 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
- region: eu-west-3
- 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
- - filename: ubuntu-20.04.tar
- image_name: ubuntu
- image_tag: 20.04
-
-users:
- - nat
diff --git a/roles/dev_images/tasks/main.yml b/roles/dev_images/tasks/main.yml
index 5d1180e..d878dba 100644
--- a/roles/dev_images/tasks/main.yml
+++ b/roles/dev_images/tasks/main.yml
@@ -10,11 +10,11 @@
version: v0.8.1
dest: $HOME/vrnetlab
-- name: Build vrnetlab images
- ansible.builtin.include_tasks: build_image.yml
- loop: "{{ vrnetlab_images }}"
- loop_control:
- loop_var: image
+# - name: Build vrnetlab images
+# ansible.builtin.include_tasks: build_image.yml
+# loop: "{{ vrnetlab_images }}"
+# loop_control:
+# loop_var: image
- name: Import normal images
ansible.builtin.include_tasks: import_image.yml
--
GitLab