openstack
/
ansible-role-python_venv_build
Code Issues Proposed changes

Use distribution_major_version for all distros except Ubuntu 

That is a follow-up patch for Rocky, that as EL derivative also follows
naming convention, where distribution_version contains also minor
version, while we need to build only against major versions of distros.
With that the only distro we need to use distro version for is Ubuntu.

Change-Id: I62f69bc31ed04ab65a167d07de44067fcaa74a66
This commit is contained in:
Dmitriy Rabotyagov 2023-11-21 10:22:01 +01:00
parent 3d1740bde2
commit 158ef2dbf1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vars/main.yml
View File

@ -46,10 +46,10 @@ venv_build_targets: |-
{% set targets = {} %}
{% for item in ((groups[venv_build_group] | default([])) | reverse) %}
{% set distro = (hostvars[item]['ansible_facts']['distribution'] | lower) | replace(' ', '_') %}
{% if distro == 'debian' or distro == 'centos' %}
{% set distro_ver = hostvars[item]['ansible_facts']['distribution_major_version'] %}
{% else %}
{% if distro == 'ubuntu' %}
{% set distro_ver = hostvars[item]['ansible_facts']['distribution_version'].split('.')[:2] | join('.') %}
{% else %}
{% set distro_ver = hostvars[item]['ansible_facts']['distribution_major_version'] %}
{% endif %}
{% set arch = hostvars[item]['ansible_facts']['architecture'] %}
{% set distro_arch = [distro, distro_ver, arch] | join('-') %}
@ -64,10 +64,10 @@ _venv_wheels_play_hosts: |-
{% for host in ansible_play_hosts %}
{% set arch = hostvars[host]['ansible_facts']['architecture'] %}
{% set distro = (hostvars[host]['ansible_facts']['distribution'] | lower) | replace(' ', '_') %}
{% if distro == 'debian' or distro == 'centos' %}
{% set distro_ver = hostvars[host]['ansible_facts']['distribution_major_version'] %}
{% else %}
{% if distro == 'ubuntu' %}
{% set distro_ver = hostvars[host]['ansible_facts']['distribution_version'].split('.')[:2] | join('.') %}
{% else %}
{% set distro_ver = hostvars[host]['ansible_facts']['distribution_major_version'] %}
{% endif %}
{% set distro_arch = [distro, distro_ver, arch] | join('-') %}
{% if distro_arch not in wheel_groups %}
@ -89,9 +89,9 @@ _venv_pip_packages: "{{ (venv_default_pip_packages | union(venv_pip_packages)) |
_venv_build_dist: >-
{{ (ansible_facts['distribution'] | lower == 'debian' or ansible_facts['distribution'] | lower == 'centos') | ternary(
ansible_facts['distribution_major_version'],
ansible_facts['distribution_version'].split('.')[:2] | join('.')
{{ (ansible_facts['distribution'] | lower == 'ubuntu') | ternary(
ansible_facts['distribution_version'].split('.')[:2] | join('.'),
ansible_facts['distribution_major_version']
) }}
_venv_build_dist_arch: >-