majic-ansible-roles Changeset

Changeset - 74acf4fb504c

Parent rev.

Child rev.

[Not reviewed]

0 6 0

Branko Majic (branko) - 2 months ago 2024-02-10 14:59:03
branko@majic.rs

MAR-191: Dropped support for Debian 10 Buster from the web_server role.

6 files changed with 2 insertions and 44 deletions:

docs/rolereference.rst

roles/web_server/defaults/main.yml

roles/web_server/meta/main.yml

roles/web_server/molecule/default/molecule.yml

roles/web_server/molecule/default/prepare.yml

roles/web_server/molecule/default/tests/conftest.py

0 comments (0 inline, 0 general)

docs/rolereference.rst

➞

Show inline comments

@@ @@ -1491,7 +1491,6 @@ Distribution compatibility @@
 Role is compatible with the following distributions:
 - Debian 10 (Buster)
 - Debian 11 (Bullseye)

roles/web_server/defaults/main.yml

➞

Show inline comments

@@ @@ -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"

roles/web_server/meta/main.yml

➞

Show inline comments

@@ @@ -11,5 +11,4 @@ galaxy_info: @@
   platforms:
     - name: Debian
       versions:
         - 10
         - 11

roles/web_server/molecule/default/molecule.yml

➞

Show inline comments

@@ @@ -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

roles/web_server/molecule/default/prepare.yml

➞

Show inline comments

@@ @@ -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:
 .168.56.11: "client"
 .168.56.21: "parameters-mandatory-buster"
 .168.56.22: "parameters-optional-buster"
 .168.56.31: "parameters-mandatory-bullseye"
 .168.56.32: "parameters-optional-bullseye"

roles/web_server/molecule/default/tests/conftest.py

➞

Show inline comments

@@ @@ -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)

0 comments (0 inline, 0 general)