Skip to content

Commit 9ec3c13

Browse files
committed
Adds os_virtualenv_python
This sets the collection wide python interpretter. This can also be set on a per role basis with: - os_openstackclient_virtualenv_python - os_openstacksdk_virtualenv_python Also adds: - os_openstackclient_virtualenv_command Depending on the version of upper constraints, you may need to use a newer python interpreter.
1 parent 47b2eba commit 9ec3c13

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

roles/os_openstackclient/defaults/main.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
os_openstackclient_venv:
44
# Whether to install package dependencies.
55
os_openstackclient_install_package_dependencies: true
6+
# Value to use for the pip module's `virtualenv_command` argument when creating the virtualenv
7+
os_openstackclient_virtualenv_command: "{{ os_openstackclient_virtualenv_python ~ ' -m venv' if os_openstackclient_venv else omit }}"
8+
# Python interpreter to use in virtualenv command; `os_virtualenv_python` can be used to set this collection wide.
9+
os_openstackclient_virtualenv_python: "{{ os_virtualenv_python | default('python3.' ~ ansible_facts.python.version.minor) }}"
610

711
# State of the openstackclient package.
812
os_openstackclient_state: present
@@ -11,3 +15,4 @@ os_openstackclient_state: present
1115
os_openstackclient_version:
1216
# Upper constraints file for installation of openstackclient.
1317
os_openstackclient_upper_constraints_file: https://releases.openstack.org/constraints/upper/2024.1
18+

roles/os_openstackclient/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
name: "{{ item.name }}"
4141
state: latest
4242
virtualenv: "{{ os_openstackclient_venv or omit }}"
43-
virtualenv_command: "{{ 'python3.' ~ ansible_facts.python.version.minor ~ ' -m venv' if os_openstackclient_venv else omit }}"
43+
virtualenv_command: "{{ os_openstackclient_virtualenv_command }}"
4444
with_items:
4545
- { name: pip }
4646
- { name: setuptools }

roles/os_openstacksdk/defaults/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
# Path to a directory in which to create a virtualenv.
33
os_openstacksdk_venv:
44
# Value to use for the pip module's `virtualenv_command` argument when creating the virtualenv
5-
os_openstacksdk_virtualenv_command: "{{ 'python3.' ~ ansible_facts.python.version.minor ~ ' -m venv' if os_openstacksdk_venv else omit }}"
5+
os_openstacksdk_virtualenv_command: "{{ os_openstacksdk_virtualenv_python ~ ' -m venv' if os_openstacksdk_venv else omit }}"
6+
# Python interpreter to use in virtualenv command; `os_virtualenv_python` can be used to set this collection wide.
7+
os_openstacksdk_virtualenv_python: "{{ os_virtualenv_python | default('python3.' ~ ansible_facts.python.version.minor) }}"
68

79
# Whether to install package dependencies.
810
os_openstacksdk_install_package_dependencies: true

0 commit comments

Comments
 (0)