From 764b7d4ca5cceef3e08dda2d235d7efa13ea7067 Mon Sep 17 00:00:00 2001 From: SebClem Date: Mon, 12 Jun 2023 17:16:38 +0200 Subject: [PATCH] Fix pip --- .vscode/settings.json | 3 ++- tasks/main.yml | 24 +++++++++--------------- vars/main.yml | 3 +-- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 2faa62e..d3dae0e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,5 +5,6 @@ "*.yml": "ansible" }, "ansible.ansible.useFullyQualifiedCollectionNames": true, - "editor.formatOnSave": true + "editor.formatOnSave": true, + "ansible.python.interpreterPath": "/root/.virtualenvs/ansible/bin/python" } diff --git a/tasks/main.yml b/tasks/main.yml index 0b4d5f9..f84d0e7 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,23 +2,17 @@ # tasks file for ansible-renovate-role - name: Ensure pip is present - package: - name: python3-pip + ansible.builtin.apt: + name: "{{ __docker_requirements }}" state: present - name: Install webhook - package: + ansible.builtin.package: name: webhook state: present -- name: Install requirements - pip: - name: "{{ item.name }}" - executable: "{{ item.exec }}" - loop: "{{ __docker_requirements }}" - - name: "Pull renovate image" - docker_image: + community.docker.docker_image: source: pull name: "{{ renovate_image_name }}" tag: "{{ renovate_image_tag }}" @@ -26,15 +20,15 @@ force_source: true - name: Add config file - template: - src: renovate-config.js.j2 + ansible.builtin.template: + src: renovate-config.js. dest: /etc/renovate/config.js owner: root group: root mode: u=rw,g=r,o=r - name: Add exec script - template: + ansible.builtin.template: src: renovate.j2 dest: /etc/renovate/renovate owner: root @@ -42,7 +36,7 @@ mode: u=rwx,g=rx,o=rx - name: Add cron - cron: + ansible.builtin.cron: name: Run renovate minute: "0" hour: "3" @@ -52,7 +46,7 @@ notify: Reload cron - name: add webhook conf - template: + ansible.builtin.template: src: webhook.conf.j2 dest: /etc/webhook.conf owner: root diff --git a/vars/main.yml b/vars/main.yml index c1a24f7..edc7453 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,5 +1,4 @@ --- # vars file for ansible-renovate-role __docker_requirements: - - name: docker - exec: pip3 + - python3-docker