From f17b5e076eba5b0e61dcca32e82a5d98fdb2b144 Mon Sep 17 00:00:00 2001
From: Karel van Klink <karel.vanklink@geant.org>
Date: Thu, 30 Mar 2023 14:14:59 +0200
Subject: [PATCH] Resolve .env issues
---
README.md | 10 +++++-----
playbook.yml | 2 --
roles/containerlab/tasks/main.yml | 6 +++---
roles/docker/tasks/main.yml | 4 ++++
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index 9e0d5c2..79ad34d 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ This playbook is used to install ContainerLab on a VM, and test network configur
To run this playbook:
```
-ansible-playbook -i $the-vm-you-want-to-configure, playbook.yml -k
+ansible-playbook -i $the-vm-you-want-to-configure, playbook.yml
```
Please note the comma after the target.
@@ -16,10 +16,10 @@ Consider that the Docker repository and the username to login on the box are pas
become: true
vars:
docker:
- registry_url: gitlab.geant.net:5005/docker/ci_registry
- username: "{{ lookup('ansible.builtin.env', 'GITLAB_USER' }}"
- private_token: "{{ lookup('ansible.builtin.env', 'GITLAB_TOKEN' }}"
- nat_user: nat <<<<<<<< username is hardcoded
+ registry_url: gitlab.geant.net:5005/docker/ci_registry <<<<<<<<<
+ username: "{{ lookup('ansible.builtin.env', 'GITLAB_USER') }}"
+ private_token: "{{ lookup('ansible.builtin.env', 'GITLAB_TOKEN') }}"
+ nat_user: nat <<<<<<<< hardcoded
roles:
- docker
- containerlab
diff --git a/playbook.yml b/playbook.yml
index 8c99028..bad79fb 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -4,8 +4,6 @@
vars:
docker:
registry_url: gitlab.geant.net:5005/docker/ci_registry
- username: "{{ lookup('ansible.builtin.env', 'GITLAB_USER') }}"
- private_token: "{{ lookup('ansible.builtin.env', 'GITLAB_TOKEN') }}"
nat_user: nat
roles:
- docker
diff --git a/roles/containerlab/tasks/main.yml b/roles/containerlab/tasks/main.yml
index eeb4cf4..0c8ed00 100644
--- a/roles/containerlab/tasks/main.yml
+++ b/roles/containerlab/tasks/main.yml
@@ -13,9 +13,9 @@
- name: Log in on Docker repository
community.docker.docker_login:
- registry_url: '{{ docker.registry_url }}'
- username: '{{ docker.username }}'
- password: '{{ docker.private_token }}'
+ registry_url: 'https://{{ docker.registry_url }}'
+ username: "{{ lookup('ansible.builtin.env', 'GITLAB_USER') }}"
+ password: "{{ lookup('ansible.builtin.env', 'GITLAB_TOKEN') }}"
no_log: true
- name: Pull vMX image from Docker repository
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index e942f53..7902030 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -29,6 +29,10 @@
state: latest
update_cache: true
+- name: Install docker-py python package
+ ansible.builtin.pip:
+ name: docker-py
+
- name: Add relevant user to docker group
ansible.builtin.user:
name: "{{ nat_user }}"
--
GitLab