From: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Date: Wed, 13 Jan 2021 12:51:30 +0000 (+0100)
Subject: teuthology: py3 for pulpito and paddles
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2711fc3a382341364c4f85679e6ac699d1bf8ddc;p=ceph-cm-ansible.git

teuthology: py3 for pulpito and paddles

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
---

diff --git a/roles/paddles/tasks/setup_paddles.yml b/roles/paddles/tasks/setup_paddles.yml
index e7a77ef..b3da7c8 100644
--- a/roles/paddles/tasks/setup_paddles.yml
+++ b/roles/paddles/tasks/setup_paddles.yml
@@ -13,6 +13,7 @@
     name: "pip"
     state: "latest"
     chdir: "{{ paddles_repo_path }}"
+    virtualenv_python: "python3"
     virtualenv: "{{ paddles_repo_path }}/virtualenv"
   become_user: "{{ paddles_user }}"
 - name: Install requirements via pip
diff --git a/roles/paddles/vars/apt_systems.yml b/roles/paddles/vars/apt_systems.yml
index 191524c..02b8a0f 100644
--- a/roles/paddles/vars/apt_systems.yml
+++ b/roles/paddles/vars/apt_systems.yml
@@ -1,12 +1,13 @@
 ---
 paddles_extra_packages:
   # The following is a requirement of ansible's postgresql module
-  - python-psycopg2
+  - python3-psycopg2
   # The following packages are requirements for running paddles
   - git-all
-  - python-dev
-  - python-pip
-  - python-virtualenv
+  - python3-dev
+  - python3-pip
+  - python3-virtualenv
+  - virtualenv
   - postgresql
   - postgresql-contrib
   - postgresql-server-dev-all
diff --git a/roles/paddles/vars/zypper_systems.yml b/roles/paddles/vars/zypper_systems.yml
index a818bb3..ee913f2 100644
--- a/roles/paddles/vars/zypper_systems.yml
+++ b/roles/paddles/vars/zypper_systems.yml
@@ -5,9 +5,9 @@ paddles_extra_packages:
   # The following packages are requirements for running paddles
   - gcc
   - git
-  - python-devel
-  - python-pip
-  - python-virtualenv
+  - python3-devel
+  - python3-pip
+  - python3-virtualenv
   - postgresql
   - postgresql-contrib
   - postgresql-devel
diff --git a/roles/pulpito/tasks/setup_pulpito.yml b/roles/pulpito/tasks/setup_pulpito.yml
index 7c1ce94..84b740f 100644
--- a/roles/pulpito/tasks/setup_pulpito.yml
+++ b/roles/pulpito/tasks/setup_pulpito.yml
@@ -16,7 +16,7 @@
   register: virtualenv
 
 - name: Create the virtualenv
-  shell: virtualenv ./virtualenv chdir={{ pulpito_repo_path }}
+  shell: virtualenv -p python3 ./virtualenv chdir={{ pulpito_repo_path }}
   become_user: "{{ pulpito_user }}"
   when: virtualenv.stat.exists == false
 
diff --git a/roles/pulpito/vars/apt_systems.yml b/roles/pulpito/vars/apt_systems.yml
index 00a6a15..07dc0bf 100644
--- a/roles/pulpito/vars/apt_systems.yml
+++ b/roles/pulpito/vars/apt_systems.yml
@@ -2,8 +2,9 @@
 pulpito_extra_packages:
   - git-core
   - supervisor
-  - python-pip
-  - python-virtualenv
+  - python3-pip
+  - python3-virtualenv
+  - virtualenv
 
 supervisor_service: supervisor
 supervisor_conf_d: /etc/supervisor/conf.d/
diff --git a/roles/pulpito/vars/yum_systems.yml b/roles/pulpito/vars/yum_systems.yml
index 1a9678d..a420d29 100644
--- a/roles/pulpito/vars/yum_systems.yml
+++ b/roles/pulpito/vars/yum_systems.yml
@@ -2,8 +2,8 @@
 pulpito_extra_packages:
   - git-all
   - supervisor
-  - python-pip
-  - python-virtualenv
+  - python3-pip
+  - python3-virtualenv
 
 supervisor_service: supervisord
 supervisor_conf_d: /etc/supervisord.d
diff --git a/roles/pulpito/vars/zypper_systems.yml b/roles/pulpito/vars/zypper_systems.yml
index 86df055..dae6ff2 100644
--- a/roles/pulpito/vars/zypper_systems.yml
+++ b/roles/pulpito/vars/zypper_systems.yml
@@ -1,8 +1,8 @@
 ---
 pulpito_extra_packages:
   - git
-  - python-pip
-  - python-virtualenv
+  - python3-pip
+  - python3-virtualenv
   - supervisor
 
 supervisor_service: supervisord