fix: allow break system package for pip install on ubuntu 24+, and do not try to install python-consul on bootstrap
Some checks failed
build-deploy / Bump version and create changelog with commitizen (push) Has been cancelled

This commit is contained in:
Bertrand Lanson 2024-09-01 16:10:36 +02:00
parent bb09995deb
commit d18ab9142d
Signed by: lanson
SSH Key Fingerprint: SHA256:/nqc6HGqld/PS208F6FUOvZlUzTS0rGpNNwR5O2bQBw
2 changed files with 6 additions and 12 deletions

View File

@ -25,17 +25,6 @@
state: present state: present
when: "'vault_servers' in group_names" when: "'vault_servers' in group_names"
- name: "Install python-consul library with pip"
ansible.builtin.include_role:
name: ednz_cloud.manage_pip_packages
vars:
manage_pip_packages_install_prereqs: true
manage_pip_packages_list:
- name: python-consul
version_constraint: latest
state: present
when: "'haproxy_servers' in group_names"
- name: "Ensure /etc/localtime exists" - name: "Ensure /etc/localtime exists"
ansible.builtin.file: ansible.builtin.file:
src: /etc/timezone src: /etc/timezone

View File

@ -3,7 +3,11 @@
# helper options # # helper options #
################## ##################
manage_pip_packages_allow_break_system_packages: "{{ ansible_distribution == 'Debian' and ansible_distribution_version == '12' }}" manage_pip_packages_allow_break_system_packages: >-
{{
(ansible_distribution == 'Debian' and (ansible_distribution_version|int) >= 12)
or (ansible_distribution == 'Ubuntu' and (ansible_distribution_major_version|int) >= 24)
}}
hashistack_configuration_directory: "{{ lookup('env', 'PWD') }}/etc/hashistack" hashistack_configuration_directory: "{{ lookup('env', 'PWD') }}/etc/hashistack"
hashistack_sub_configuration_directories: hashistack_sub_configuration_directories:
@ -34,6 +38,7 @@ hashistack_supported_distribution_versions:
ubuntu: ubuntu:
- "20.04" - "20.04"
- "22.04" - "22.04"
- "24.04"
preflight_enable_host_ntp_checks: true preflight_enable_host_ntp_checks: true
haproxy_required_ports: [80, 443] haproxy_required_ports: [80, 443]