From 97861951abe9e57f0670acfeefec8ebe3413176f Mon Sep 17 00:00:00 2001 From: David Galloway Date: Thu, 18 Nov 2021 15:15:15 -0500 Subject: [PATCH] container-host: Install python dependencies I need this role for Jenkins builders. They don't get setuptools or pip installed during the common role. Signed-off-by: David Galloway --- roles/container-host/tasks/container_mirror.yml | 1 + roles/container-host/vars/apt_systems.yml | 2 ++ roles/container-host/vars/centos_7.yml | 6 ++++++ roles/container-host/vars/ubuntu_18.yml | 7 +++++++ 4 files changed, 16 insertions(+) create mode 100644 roles/container-host/vars/centos_7.yml create mode 100644 roles/container-host/vars/ubuntu_18.yml diff --git a/roles/container-host/tasks/container_mirror.yml b/roles/container-host/tasks/container_mirror.yml index 72ced9a..74f5bd1 100644 --- a/roles/container-host/tasks/container_mirror.yml +++ b/roles/container-host/tasks/container_mirror.yml @@ -22,6 +22,7 @@ pip: name: git+https://github.com/sebastian-philipp/registries-conf-ctl state: latest + executable: "{{ pip_executable|default('pip3') }}" tags: - registries-conf-ctl diff --git a/roles/container-host/vars/apt_systems.yml b/roles/container-host/vars/apt_systems.yml index 3c25aed..e513e8d 100644 --- a/roles/container-host/vars/apt_systems.yml +++ b/roles/container-host/vars/apt_systems.yml @@ -1,3 +1,5 @@ --- container_packages: - docker.io + - python3-setuptools + - python3-pip diff --git a/roles/container-host/vars/centos_7.yml b/roles/container-host/vars/centos_7.yml new file mode 100644 index 0000000..e0d5907 --- /dev/null +++ b/roles/container-host/vars/centos_7.yml @@ -0,0 +1,6 @@ +--- +container_packages: + - podman + - podman-docker + +pip_executable: pip diff --git a/roles/container-host/vars/ubuntu_18.yml b/roles/container-host/vars/ubuntu_18.yml new file mode 100644 index 0000000..4dc4ea9 --- /dev/null +++ b/roles/container-host/vars/ubuntu_18.yml @@ -0,0 +1,7 @@ +--- +container_packages: + - docker.io + - python-setuptools + - python-pip + +pip_executable: pip -- 2.39.5