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 <dgallowa@redhat.com>

diff --git a/roles/container-host/tasks/container_mirror.yml b/roles/container-host/tasks/container_mirror.yml
index 72ced9abdf31788cd0361bc5e32cf40c644c5c9f..74f5bd16ae095d510a6ebe0a1711d330ce39945b 100644 (file)
--- 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 3c25aed54fb2addc138170b2a088b98df8b697c6..e513e8d1f41aac71a15178a2292d5d951aab0974 100644 (file)
--- 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 (file)
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 (file)
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