diff --git a/README.md b/README.md index 9e0d5c2555be380b5de3237ada68c5c3be22ba59..79ad34d1ee6ed8e25222a45dbb5cf46dda3cd7fc 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 8c9902862e7488f93088eebd1f1fcb74995b3e48..bad79fbabae2d057c1581e36fe7751d9d81cd40e 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 eeb4cf42ed054f34add4fe7e05e127a8cc119dd1..0c8ed007c3e7c2658ed43a5197ef529f3d1e79d2 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 e942f53acbc2380f1020ebb601591b59a747bc9f..7902030c6d403b85d36f2e36adda5ab9f070ccb8 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 }}"