From e2baa97cfd7cb7f4bd935aa61b23af6cd0fcb0a9 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 24 Nov 2019 16:44:32 +0100 Subject: [PATCH] refactoring and cleanup --- molecule/default/playbook.yml | 1 + tasks/main.yml | 2 +- tasks/{install.yml => setup.yml} | 9 ++++----- vars/main.yml | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) rename tasks/{install.yml => setup.yml} (92%) create mode 100644 vars/main.yml diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml index 8014c35..0cf7910 100644 --- a/molecule/default/playbook.yml +++ b/molecule/default/playbook.yml @@ -7,4 +7,5 @@ - python2-pip roles: + - role: xoxys.python3 - role: xoxys.docker-engine diff --git a/tasks/main.yml b/tasks/main.yml index a48ceb8..1f69f7a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include_tasks: install.yml +- include_tasks: setup.yml diff --git a/tasks/install.yml b/tasks/setup.yml similarity index 92% rename from tasks/install.yml rename to tasks/setup.yml index c5d9655..b9c5e9c 100644 --- a/tasks/install.yml +++ b/tasks/setup.yml @@ -11,13 +11,12 @@ state: present loop: "{{ dockerengine_packages_extra }}" - - name: Install python dependencies + - name: Install python requirements pip: - name: "{{ item }}" + name: "{{ item.name }}" + executable: "{{ item.exec | default(omit) }}" state: present - loop: - - docker - - docker-compose~=1.24.0 + loop: "{{ __docker_python_requirements }}" - name: Add docker group group: diff --git a/vars/main.yml b/vars/main.yml new file mode 100644 index 0000000..dcbd206 --- /dev/null +++ b/vars/main.yml @@ -0,0 +1,5 @@ +--- +__docker_python_requirements: + - name: docker + - name: docker-compose + exec: /usr/bin/pip3