From 72a32e8be299541a6d6b3933940146f8b4377889 2024-08-30 20:12:36 From: Branko Majic Date: 2024-08-30 20:12:36 Subject: [PATCH] MAR-239: Dropped support for Debian 11 Bullseye from the web_server role. --- diff --git a/roles/web_server/defaults/main.yml b/roles/web_server/defaults/main.yml index d67bdaf279eb21cf3bba8083f7e2d05c44634bb7..a8650ecab1b70da82c519c60059908d5355bcfba 100644 --- a/roles/web_server/defaults/main.yml +++ b/roles/web_server/defaults/main.yml @@ -17,11 +17,9 @@ ECDHE-RSA-CHACHA20-POLY1305:\ # Internal parameters php_fpm_service_name_per_release: - bullseye: "php7.4-fpm" bookworm: "php8.2-fpm" php_base_config_dir_per_release: - bullseye: "/etc/php/7.4" bookworm: "/etc/php/8.2" php_fpm_package_name: "php-fpm" diff --git a/roles/web_server/molecule/default/molecule.yml b/roles/web_server/molecule/default/molecule.yml index 0528862b5e501c99f5a732929b8e0369efb7f56f..735eb61da44f43a4d13d608807ec86e13c63bc0e 100644 --- a/roles/web_server/molecule/default/molecule.yml +++ b/roles/web_server/molecule/default/molecule.yml @@ -26,36 +26,6 @@ platforms: network_name: private_network type: static - - name: parameters-mandatory-bullseye - groups: - - parameters-mandatory - - bullseye - box: debian/bullseye64 - memory: 512 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - interfaces: - - auto_config: true - ip: 192.168.56.31 - network_name: private_network - type: static - - - name: parameters-optional-bullseye - groups: - - parameters-optional - - bullseye - box: debian/bullseye64 - memory: 512 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - interfaces: - - auto_config: true - ip: 192.168.56.32 - network_name: private_network - type: static - - name: parameters-mandatory-bookworm groups: - parameters-mandatory diff --git a/roles/web_server/molecule/default/prepare.yml b/roles/web_server/molecule/default/prepare.yml index fde393deb195a6da362006e1843610168fb3f967..90e28a280cd84ee3834bfebc24d5eb9d3a698e99 100644 --- a/roles/web_server/molecule/default/prepare.yml +++ b/roles/web_server/molecule/default/prepare.yml @@ -23,10 +23,6 @@ - "{{ item.name }}" - "{{ item.fqdn }}" with_items: - - name: parameters-mandatory-bullseye_https - fqdn: parameters-mandatory-bullseye - - name: parameters-optional-bullseye_https - fqdn: parameters-optional-bullseye - name: parameters-mandatory-bookworm_https fqdn: parameters-mandatory-bookworm - name: parameters-optional-bookworm_https @@ -100,8 +96,6 @@ state: present with_dict: 192.168.56.11: "client" - 192.168.56.31: "parameters-mandatory-bullseye" - 192.168.56.32: "parameters-optional-bullseye" 192.168.56.21: "parameters-mandatory-bookworm" 192.168.56.22: "parameters-optional-bookworm" diff --git a/roles/web_server/molecule/default/tests/conftest.py b/roles/web_server/molecule/default/tests/conftest.py index 928ed6d9ecbf67d92de6532082033f4eac0234a4..a917a6e99027a7efbe81f4e696dd9928c617bf1d 100644 --- a/roles/web_server/molecule/default/tests/conftest.py +++ b/roles/web_server/molecule/default/tests/conftest.py @@ -12,7 +12,7 @@ def php_info(host): Currently supports: - - Debian 11 (Bullseye) + - Debian 12 (Bookworm) Resulting information can be accessed through returned named tuple with the following properties: @@ -27,9 +27,7 @@ def php_info(host): ansible_facts = host.ansible("setup")["ansible_facts"] ansible_distribution_release = ansible_facts['ansible_distribution_release'] - if ansible_distribution_release == 'bullseye': - info = PHPInfo(fpm_package='php-fpm', fpm_service='php7.4-fpm', base_config_dir='/etc/php/7.4') - elif ansible_distribution_release == 'bookworm': + if ansible_distribution_release == 'bookworm': info = PHPInfo(fpm_package='php-fpm', fpm_service='php8.2-fpm', base_config_dir='/etc/php/8.2') else: raise Exception('The php_info pytest fixture does not support Debian release: %s' % ansible_distribution_release)