diff --git a/docs/rolereference.rst b/docs/rolereference.rst index cb078237c84bb4c31db14a624585a4df20edf83e..1a2fb49f78c8cd7d8f1d2358faf69c41dd9cb69c 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -1491,7 +1491,6 @@ Distribution compatibility Role is compatible with the following distributions: -- Debian 10 (Buster) - Debian 11 (Bullseye) diff --git a/roles/web_server/defaults/main.yml b/roles/web_server/defaults/main.yml index c5eca024a1679a41e45938ab837771130e077774..239acd5f6078b0b59783df7f1f15a53374b00d4b 100644 --- a/roles/web_server/defaults/main.yml +++ b/roles/web_server/defaults/main.yml @@ -15,11 +15,9 @@ ECDHE-RSA-CHACHA20-POLY1305:\ # Internal parameters php_fpm_service_name_per_release: - buster: "php7.3-fpm" bullseye: "php7.4-fpm" php_base_config_dir_per_release: - buster: "/etc/php/7.3" bullseye: "/etc/php/7.4" php_fpm_package_name: "php-fpm" diff --git a/roles/web_server/meta/main.yml b/roles/web_server/meta/main.yml index f1b4f56b3dd782bd084534879cb257023232a2b5..4af6412181745036170b3efb07a43f2bf248b99a 100644 --- a/roles/web_server/meta/main.yml +++ b/roles/web_server/meta/main.yml @@ -11,5 +11,4 @@ galaxy_info: platforms: - name: Debian versions: - - 10 - 11 diff --git a/roles/web_server/molecule/default/molecule.yml b/roles/web_server/molecule/default/molecule.yml index a9da3bb4fc765981eb5fd2570651b61da989e4a7..31d7637a380c4edf67ca976d743fac70785fe86a 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-buster - groups: - - parameters-mandatory - - buster - box: debian/contrib-buster64 - memory: 512 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - interfaces: - - auto_config: true - ip: 192.168.56.21 - network_name: private_network - type: static - - - name: parameters-optional-buster - groups: - - parameters-optional - - buster - box: debian/contrib-buster64 - memory: 512 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - interfaces: - - auto_config: true - ip: 192.168.56.22 - network_name: private_network - type: static - - name: parameters-mandatory-bullseye groups: - parameters-mandatory diff --git a/roles/web_server/molecule/default/prepare.yml b/roles/web_server/molecule/default/prepare.yml index fb3bea74203adc6c1a75d8ea38193eaddff14fa0..b125fb39419c068c1fad7aec8582f085bf06470f 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-buster_https - fqdn: parameters-mandatory-buster - - name: parameters-optional-buster_https - fqdn: parameters-optional-buster - name: parameters-mandatory-bullseye_https fqdn: parameters-mandatory-bullseye - name: parameters-optional-bullseye_https @@ -78,8 +74,6 @@ state: present with_dict: 192.168.56.11: "client" - 192.168.56.21: "parameters-mandatory-buster" - 192.168.56.22: "parameters-optional-buster" 192.168.56.31: "parameters-mandatory-bullseye" 192.168.56.32: "parameters-optional-bullseye" diff --git a/roles/web_server/molecule/default/tests/conftest.py b/roles/web_server/molecule/default/tests/conftest.py index ab25ed0e190b7509af8806e1c31b9ce6ddfb266e..fb51c74bd837d920c5bfe479e10fb7f432fae458 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 10 (Buster) + - Debian 11 (Bullseye) 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 == 'buster': - info = PHPInfo(fpm_package='php-fpm', fpm_service='php7.3-fpm', base_config_dir='/etc/php/7.3') - elif ansible_distribution_release == 'bullseye': + if ansible_distribution_release == 'bullseye': info = PHPInfo(fpm_package='php-fpm', fpm_service='php7.4-fpm', base_config_dir='/etc/php/7.4') else: raise Exception('The php_info pytest fixture does not support Debian release: %s' % ansible_distribution_release)