diff --git a/playbooks/bootstrap.yml b/playbooks/bootstrap.yml index 1379e86..b034add 100644 --- a/playbooks/bootstrap.yml +++ b/playbooks/bootstrap.yml @@ -25,17 +25,6 @@ state: present 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" ansible.builtin.file: src: /etc/timezone diff --git a/playbooks/group_vars/all/all.yml b/playbooks/group_vars/all/all.yml index c03e234..377d18c 100644 --- a/playbooks/group_vars/all/all.yml +++ b/playbooks/group_vars/all/all.yml @@ -3,7 +3,11 @@ # 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_sub_configuration_directories: @@ -34,6 +38,7 @@ hashistack_supported_distribution_versions: ubuntu: - "20.04" - "22.04" + - "24.04" preflight_enable_host_ntp_checks: true haproxy_required_ports: [80, 443]