From 1025e67206561c82f9b12bb2c9d1ea20cdcd1c12 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 25 Nov 2019 00:49:53 +0100 Subject: [PATCH] install ansible deps with yum --- defaults/main.yml | 1 - molecule/default/playbook.yml | 5 ----- tasks/install.yml | 10 +--------- vars/main.yml | 3 +++ 4 files changed, 4 insertions(+), 15 deletions(-) create mode 100644 vars/main.yml diff --git a/defaults/main.yml b/defaults/main.yml index a1a79de..98d1237 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,7 +6,6 @@ dockerengine_packages: # The role requires epel repository and pip to work .You can use # `dockerengine_packages_extra` to install these dependencys. # @end -# @var dockerengine_packages_extra:example: $ ["epel-release", "python2-pip"] dockerengine_packages_extra: [] dockerengine_packages_python: diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml index 0cf7910..bc95e76 100644 --- a/molecule/default/playbook.yml +++ b/molecule/default/playbook.yml @@ -1,11 +1,6 @@ --- - name: Converge hosts: all - vars: - dockerengine_packages_extra: - - epel-release - - python2-pip - roles: - role: xoxys.python3 - role: xoxys.docker-engine diff --git a/tasks/install.yml b/tasks/install.yml index 66a657f..0e3148c 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -10,7 +10,7 @@ package: name: "{{ item }}" state: present - loop: "{{ dockerengine_packages }}" + loop: "{{ dockerengine_packages + __docker_ansible_deps }}" - name: Install python packages pip: @@ -22,11 +22,3 @@ label: "{{ item.name }}" become: True become_user: root - -- name: Install ansible requirements - pip: - name: "{{ item }}" - state: present - extra_args: --user -I - loop: - - docker diff --git a/vars/main.yml b/vars/main.yml new file mode 100644 index 0000000..ec45b5c --- /dev/null +++ b/vars/main.yml @@ -0,0 +1,3 @@ +--- +__docker_ansible_deps: + - python-docker-py