From 655da6dacc2985dcfeacc31e1209b72861fb4416 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Mon, 15 Mar 2021 16:11:41 +0100 Subject: [PATCH] (Python) consistency changes --- Dockerfile | 4 ++-- defaults/main.yml | 2 +- handlers/main.yml | 2 +- meta/main.yml | 3 ++- tasks/main.yml | 2 +- tests/pre.yml | 2 +- tests/test.yml | 2 +- tests/vagrant.yml | 2 +- tests/vars/main.yml | 2 +- vars/main.yml | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 78650c6..b179278 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,13 +5,13 @@ MAINTAINER Mischa ter Smitten RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal python-dev curl && \ apt-get clean -RUN curl -sL https://bootstrap.pypa.io/get-pip.py | python - +RUN curl -sL https://bootstrap.pypa.io/pip/2.7/get-pip.py | python - RUN rm -rf $HOME/.cache # ansible RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gcc libffi-dev libssl-dev && \ apt-get clean -RUN pip install ansible==2.9.14 +RUN pip install ansible==2.9.15 RUN rm -rf $HOME/.cache # provision diff --git a/defaults/main.yml b/defaults/main.yml index 8c1c4c4..ecdd2b0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,3 +1,3 @@ -# defaults file for ca-certificates +# defaults file --- ca_certificates_certificate_map: [] diff --git a/handlers/main.yml b/handlers/main.yml index 06b7fee..161144a 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,4 +1,4 @@ -# handlers file for ca-certificates +# handlers file --- - name: update ca-certificates command: > diff --git a/meta/main.yml b/meta/main.yml index 8128fe6..f5ebb0d 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,6 +1,7 @@ -# meta file for ca-certificates +# meta file --- galaxy_info: + namespace: oefenweb role_name: ca-certificates author: Mischa ter Smitten company: Oefenweb.nl B.V. diff --git a/tasks/main.yml b/tasks/main.yml index 920347b..6fb8758 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,4 +1,4 @@ -# tasks file for ca-certificates +# tasks file --- - name: install dependencies apt: diff --git a/tests/pre.yml b/tests/pre.yml index cbf34f5..3ba83a3 100644 --- a/tests/pre.yml +++ b/tests/pre.yml @@ -1,4 +1,4 @@ -# pre test file for ssh-keys +# pre test file --- - name: pre | install dependencies apt: diff --git a/tests/test.yml b/tests/test.yml index 4b87f7a..2c5781b 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -1,4 +1,4 @@ -# test file for ca-certificates +# test file --- - hosts: localhost connection: local diff --git a/tests/vagrant.yml b/tests/vagrant.yml index e60ecd5..c64c0c1 100644 --- a/tests/vagrant.yml +++ b/tests/vagrant.yml @@ -1,4 +1,4 @@ -# test file for ca-certificates +# test file --- - hosts: all remote_user: vagrant diff --git a/tests/vars/main.yml b/tests/vars/main.yml index b715ecf..2df2f57 100644 --- a/tests/vars/main.yml +++ b/tests/vars/main.yml @@ -1,4 +1,4 @@ -# vars file for ca-certificates +# vars file --- ca_certificates_certificate_map: - src: ca-oefenweb-nl.crt diff --git a/vars/main.yml b/vars/main.yml index 2d84b22..4757c68 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,4 +1,4 @@ -# vars file for ca-certificates +# vars file --- ca_certificates_dependencies: - ca-certificates